summaryrefslogtreecommitdiff
path: root/src/map/mob.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-05-18 17:37:33 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-05-18 18:49:39 -0700
commitac359e696f162090840dab488a6ef4981d35bbda (patch)
tree2ee04de23428bba264d1e39c80d5f50180d1b555 /src/map/mob.cpp
parentfd00d50574064db9edfcccc4286ed8f1b55b185a (diff)
downloadtmwa-ac359e696f162090840dab488a6ef4981d35bbda.tar.gz
tmwa-ac359e696f162090840dab488a6ef4981d35bbda.tar.bz2
tmwa-ac359e696f162090840dab488a6ef4981d35bbda.tar.xz
tmwa-ac359e696f162090840dab488a6ef4981d35bbda.zip
Tweak a little memory management in char-server
Diffstat (limited to 'src/map/mob.cpp')
-rw-r--r--src/map/mob.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index be9e71d..8921803 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -2695,12 +2695,12 @@ int mob_damage(struct block_list *src, struct mob_data *md, int damage,
sd = mvp_sd;
else
{
- struct map_session_data *tmp_sd;
- int i;
- for (i = 0; i < fd_max; i++)
+ for (int i = 0; i < fd_max; i++)
{
- if (session[i] && (tmp_sd = (struct map_session_data *)session[i]->session_data)
- && tmp_sd->state.auth)
+ if (!session[i])
+ continue;
+ map_session_data *tmp_sd = static_cast<map_session_data *>(session[i]->session_data.get());
+ if (tmp_sd && tmp_sd->state.auth)
{
if (md->bl.m == tmp_sd->bl.m)
{
@@ -3060,8 +3060,7 @@ void mobskill_castend_id(TimerData *, tick_t tick, int id)
range = skill_get_range(md->skillid, md->skilllv);
if (range < 0)
range = battle_get_range(&md->bl) - (range + 1);
- if (range + battle_config.mob_skill_add_range <
- distance(md->bl.x, md->bl.y, bl->x, bl->y))
+ if (range + battle_config.mob_skill_add_range < distance(md->bl.x, md->bl.y, bl->x, bl->y))
return;
md->skilldelay[md->skillidx] = tick;
@@ -3113,8 +3112,7 @@ void mobskill_castend_pos(TimerData *, tick_t tick, int id)
range = skill_get_range(md->skillid, md->skilllv);
if (range < 0)
range = battle_get_range(&md->bl) - (range + 1);
- if (range + battle_config.mob_skill_add_range <
- distance(md->bl.x, md->bl.y, md->skillx, md->skilly))
+ if (range + battle_config.mob_skill_add_range < distance(md->bl.x, md->bl.y, md->skillx, md->skilly))
return;
md->skilldelay[md->skillidx] = tick;