モンスターのテレポートバックやテレポートで候補位置が同じだった場合に

モンスターが消えてしまうバグを修正. また, グリッドのm_idxの移動操作は
"新しい位置にm_idxを入れて古い位置は0にする" ではなく "古い位置を0に
して新しい位置にm_idxを入れる" 順序に直した.

diff --git a/src/floors.c b/src/floors.c
index 33f5f2c..1514660 100644 (file)
--- a/src/floors.c
+++ b/src/floors.c
@@ -707,12 +707,12 @@ static void get_out_monster(void)
 
                m_ptr = &m_list[m_idx];
 
-               /* Update the new location */
-               cave[ny][nx].m_idx = m_idx;
-
                /* Update the old location */
                cave[oy][ox].m_idx = 0;
 
+               /* Update the new location */
+               cave[ny][nx].m_idx = m_idx;
+
                /* Move the monster */
                m_ptr->fy = ny;
                m_ptr->fx = nx; 

diff --git a/src/spells2.c b/src/spells2.c
index ee38ff3..884abbf 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -5701,12 +5701,12 @@ msg_format("%^s
                                        {
                                                int m_idx = cave[yy][xx].m_idx;
 
-                                               /* Update the new location */
-                                               cave[sy][sx].m_idx = m_idx;
-
                                                /* Update the old location */
                                                cave[yy][xx].m_idx = 0;
 
+                                               /* Update the new location */
+                                               cave[sy][sx].m_idx = m_idx;
+
                                                /* Move the monster */
                                                m_ptr->fy = sy;
                                                m_ptr->fx = sx;

diff --git a/src/spells3.c b/src/spells3.c
index 3d2dd85..142361d 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -127,12 +127,12 @@ bool teleport_away(int m_idx, int dis, bool dec_valour, bool passive)
        /* Sound */
        sound(SOUND_TPOTHER);
 
-       /* Update the new location */
-       cave[ny][nx].m_idx = m_idx;
-
        /* Update the old location */
        cave[oy][ox].m_idx = 0;
 
+       /* Update the new location */
+       cave[ny][nx].m_idx = m_idx;
+
        /* Move the monster */
        m_ptr->fy = ny;
        m_ptr->fx = nx;
@@ -230,12 +230,12 @@ void teleport_monster_to(int m_idx, int ty, int tx, int power, bool passive)
        /* Sound */
        sound(SOUND_TPOTHER);
 
-       /* Update the new location */
-       cave[ny][nx].m_idx = m_idx;
-
        /* Update the old location */
        cave[oy][ox].m_idx = 0;
 
+       /* Update the new location */
+       cave[ny][nx].m_idx = m_idx;
+
        /* Move the monster */
        m_ptr->fy = ny;
        m_ptr->fx = nx;