diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-01-16 18:18:57 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-01-17 17:35:36 -0800 |
| commit | d0e9a569f832fae6a91d163c6c8b93f7eb924ff5 (patch) | |
| tree | 8499075d69e3b00bf12c16da6a52ef4d7e98be2f /src/map/mob.cpp | |
| parent | b34acd1a97e7f087882675e812fda04d303dc6e0 (diff) | |
| download | tmwa-d0e9a569f832fae6a91d163c6c8b93f7eb924ff5.tar.gz tmwa-d0e9a569f832fae6a91d163c6c8b93f7eb924ff5.tar.bz2 tmwa-d0e9a569f832fae6a91d163c6c8b93f7eb924ff5.tar.xz tmwa-d0e9a569f832fae6a91d163c6c8b93f7eb924ff5.zip | |
Clean up some things after declassization
Diffstat (limited to 'src/map/mob.cpp')
| -rw-r--r-- | src/map/mob.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/map/mob.cpp b/src/map/mob.cpp index 75e59d8..4b68cd9 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -21,6 +21,8 @@ #include "pc.hpp" #include "skill.hpp" +#include "../poison.hpp" + #define MIN_MOBTHINKTIME 100 #define MOB_LAZYMOVEPERC 50 // Move probability in the negligent mode MOB (rate of 1000 minute) @@ -3136,7 +3138,6 @@ int mob_warp(struct mob_data *md, int m, int x, int y, int type) } else { - m = md->bl.m; if (battle_config.error_log == 1) PRINTF("MOB %d warp failed, mob_class = %d\n", md->bl.id, md->mob_class); } @@ -3463,15 +3464,6 @@ void mobskill_castend_pos(timer_id tid, tick_t tick, custom_id_t id, custom_data if (md->sc_data[SC_BERSERK].timer != -1) //バーサーク return; - if (battle_config.monster_skill_reiteration == 0) - { - range = -1; - } - if (battle_config.monster_skill_nofootset == 1) - { - range = -1; - } - if (battle_config.monster_land_skill_limit == 1) { maxcount = skill_get_maxcount(md->skillid); @@ -3890,7 +3882,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, // 自分の周囲 if (ms[ii].target >= MST_AROUND1) { - int bx = x, by = y, i = 0, c, m = bl->m; + int bx, by, i = 0, c, m = bl->m; // the enum values for radii are adjacent int r = int(ms[i].target) - int(MST_AROUND1); do @@ -3911,7 +3903,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, // 相手の周囲 if (ms[ii].target >= MST_AROUND5) { - int bx = x, by = y, i = 0, c, m = bl->m; + int bx, by, i = 0, c, m = bl->m; int r = int(ms[i].target) - int(MST_AROUND5) + 1; do { |