Modify travel command

[hengband/hengband.git] / src / floors.c

diff --git a/src/floors.c b/src/floors.c
index b2b5cf6..5873e79 100644 (file)
--- a/src/floors.c
+++ b/src/floors.c
@@ -371,7 +371,7 @@ static void preserve_pet(void)
                else
                {
                        /* Preserve the mount */
-                       COPY(&party_mon[0], m_ptr, monster_type);
+                       (void)COPY(&party_mon[0], m_ptr, monster_type);
 
                        /* Delete from this floor */
                        delete_monster_idx(p_ptr->riding);
@@ -422,7 +422,7 @@ static void preserve_pet(void)
                                }
                        }
 
-                       COPY(&party_mon[num], &m_list[i], monster_type);
+                       (void)COPY(&party_mon[num], &m_list[i], monster_type);
 
                        num++;
 
@@ -444,7 +444,7 @@ static void preserve_pet(void)
                        if (p_ptr->riding == i) continue;
 
                        monster_desc(m_name, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
-                       do_cmd_write_nikki(NIKKI_NAMED_PET, 4, m_name);
+                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_MOVED, m_name);
                }
        }
 
@@ -606,7 +606,7 @@ static void place_pet(void)
                        if (record_named_pet && m_ptr->nickname)
                        {
                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                               do_cmd_write_nikki(NIKKI_NAMED_PET, 5, m_name);
+                               do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, m_name);
                        }
 
                        /* Pre-calculated in precalc_cur_num_of_pet(), but need to decrease */
@@ -615,7 +615,7 @@ static void place_pet(void)
        }
 
        /* For accuracy of precalc_cur_num_of_pet() */
-       C_WIPE(party_mon, MAX_PARTY_MON, monster_type);
+       (void)C_WIPE(party_mon, MAX_PARTY_MON, monster_type);
 }
 
 
@@ -1389,6 +1389,9 @@ void change_floor(void)
        /* Place preserved pet monsters */
        place_pet();
 
+       /* Reset travel target place */
+       forget_travel_flow();
+
        /* Hack -- maintain unique and artifacts */
        update_unique_artifact(new_floor_id);