| Revision | efce611bd126dfc6851391faa5af1b3db255cd3b (tree) |
|---|---|
| Time | 2005-08-14 22:10:07 |
| Author | henkma <henkma@0568...> |
| Commiter | henkma |
teleport系の行動ではプレイヤーはトラップの上に行かないように修正.
src/spells3.c (diff)| @@ -267,6 +267,9 @@ bool cave_player_teleportable_bold(int y, int x, u32b mode) | ||
| 267 | 267 | |
| 268 | 268 | if (c_ptr->m_idx && (c_ptr->m_idx != p_ptr->riding)) return FALSE; |
| 269 | 269 | |
| 270 | + /* don't teleport on a trap. */ | |
| 271 | + if (have_flag(f_ptr->flags, FF_HIT_TRAP)) return FALSE; | |
| 272 | + | |
| 270 | 273 | if (!(mode & TELEPORT_PASSIVE)) |
| 271 | 274 | { |
| 272 | 275 | if (!player_can_enter(c_ptr->feat, 0)) return FALSE; |
| @@ -285,10 +288,6 @@ bool cave_player_teleportable_bold(int y, int x, u32b mode) | ||
| 285 | 288 | if (!p_ptr->levitation) return FALSE; |
| 286 | 289 | } |
| 287 | 290 | |
| 288 | - if (have_flag(f_ptr->flags, FF_HIT_TRAP)) | |
| 289 | - { | |
| 290 | - if (!is_known_trap(c_ptr) || !trap_can_be_ignored(c_ptr->feat)) return FALSE; | |
| 291 | - } | |
| 292 | 291 | } |
| 293 | 292 | |
| 294 | 293 | return TRUE; |
Fork