diff options
| author | Wushin <pasekei@gmail.com> | 2015-09-25 22:56:23 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-09-25 22:56:23 -0500 |
| commit | 27a6ccd14809eb1c497adc398ecbecd0c0bd3c98 (patch) | |
| tree | a66cc418d6440834691e2a26aba1956881d05d18 /src | |
| parent | 7a8b54d11ce8c4fbbd83c6ccf2d8ec79900963b2 (diff) | |
| parent | 4dd5e85db6d2958c95c1b2511089f5219f24af37 (diff) | |
| download | tmwa-27a6ccd14809eb1c497adc398ecbecd0c0bd3c98.tar.gz tmwa-27a6ccd14809eb1c497adc398ecbecd0c0bd3c98.tar.bz2 tmwa-27a6ccd14809eb1c497adc398ecbecd0c0bd3c98.tar.xz tmwa-27a6ccd14809eb1c497adc398ecbecd0c0bd3c98.zip | |
Merge pull request #153 from wushin/warp-mob-freeze
Warp mob freeze
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/mob.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mob.cpp b/src/map/mob.cpp index d037972..9fe6b2d 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -804,10 +804,10 @@ int mob_attack(dumb_ptr<mob_data> md, tick_t tick) nullpo_retz(md); - if ((tbl = map_id2bl(md->target_id)) == nullptr) + if (!mob_check_attack(md)) return 0; - if (!mob_check_attack(md)) + if ((tbl = map_id2bl(md->target_id)) == nullptr) return 0; if (battle_config.monster_attack_direction_change) |