| Revision | ac22ca30c94c957b8c9c69c7030956a41bb78625 (tree) |
|---|---|
| Time | 2004-01-15 21:26:21 |
| Author | nothere <nothere@0568...> |
| Commiter | nothere |
モンスターのテレポートバックやテレポートで候補位置が同じだった場合に
モンスターが消えてしまうバグを修正. また, グリッドのm_idxの移動操作は
"新しい位置にm_idxを入れて古い位置は0にする" ではなく "古い位置を0に
して新しい位置にm_idxを入れる" 順序に直した.
src/floors.c (diff) src/spells2.c (diff) src/spells3.c (diff)| @@ -707,12 +707,12 @@ static void get_out_monster(void) | ||
| 707 | 707 | |
| 708 | 708 | m_ptr = &m_list[m_idx]; |
| 709 | 709 | |
| 710 | - /* Update the new location */ | |
| 711 | - cave[ny][nx].m_idx = m_idx; | |
| 712 | - | |
| 713 | 710 | /* Update the old location */ |
| 714 | 711 | cave[oy][ox].m_idx = 0; |
| 715 | 712 | |
| 713 | + /* Update the new location */ | |
| 714 | + cave[ny][nx].m_idx = m_idx; | |
| 715 | + | |
| 716 | 716 | /* Move the monster */ |
| 717 | 717 | m_ptr->fy = ny; |
| 718 | 718 | m_ptr->fx = nx; |
| @@ -5701,12 +5701,12 @@ msg_format("%^s | ||
| 5701 | 5701 | { |
| 5702 | 5702 | int m_idx = cave[yy][xx].m_idx; |
| 5703 | 5703 | |
| 5704 | - /* Update the new location */ | |
| 5705 | - cave[sy][sx].m_idx = m_idx; | |
| 5706 | - | |
| 5707 | 5704 | /* Update the old location */ |
| 5708 | 5705 | cave[yy][xx].m_idx = 0; |
| 5709 | 5706 | |
| 5707 | + /* Update the new location */ | |
| 5708 | + cave[sy][sx].m_idx = m_idx; | |
| 5709 | + | |
| 5710 | 5710 | /* Move the monster */ |
| 5711 | 5711 | m_ptr->fy = sy; |
| 5712 | 5712 | m_ptr->fx = sx; |
| @@ -127,12 +127,12 @@ bool teleport_away(int m_idx, int dis, bool dec_valour, bool passive) | ||
| 127 | 127 | /* Sound */ |
| 128 | 128 | sound(SOUND_TPOTHER); |
| 129 | 129 | |
| 130 | - /* Update the new location */ | |
| 131 | - cave[ny][nx].m_idx = m_idx; | |
| 132 | - | |
| 133 | 130 | /* Update the old location */ |
| 134 | 131 | cave[oy][ox].m_idx = 0; |
| 135 | 132 | |
| 133 | + /* Update the new location */ | |
| 134 | + cave[ny][nx].m_idx = m_idx; | |
| 135 | + | |
| 136 | 136 | /* Move the monster */ |
| 137 | 137 | m_ptr->fy = ny; |
| 138 | 138 | m_ptr->fx = nx; |
| @@ -230,12 +230,12 @@ void teleport_monster_to(int m_idx, int ty, int tx, int power, bool passive) | ||
| 230 | 230 | /* Sound */ |
| 231 | 231 | sound(SOUND_TPOTHER); |
| 232 | 232 | |
| 233 | - /* Update the new location */ | |
| 234 | - cave[ny][nx].m_idx = m_idx; | |
| 235 | - | |
| 236 | 233 | /* Update the old location */ |
| 237 | 234 | cave[oy][ox].m_idx = 0; |
| 238 | 235 | |
| 236 | + /* Update the new location */ | |
| 237 | + cave[ny][nx].m_idx = m_idx; | |
| 238 | + | |
| 239 | 239 | /* Move the monster */ |
| 240 | 240 | m_ptr->fy = ny; |
| 241 | 241 | m_ptr->fx = nx; |
Fork