summaryrefslogtreecommitdiff
path: root/src/map/atcommand.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-10-12 18:41:40 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-10-12 18:41:40 -0700
commitedd67db458188a76934b963e6a40f7b681f86b3d (patch)
treec8dec729b3f539ba027b1b3559598dbad0a70546 /src/map/atcommand.cpp
parent524df2190b855c4096449a1aaa7b92a15875f7a7 (diff)
downloadtmwa-edd67db458188a76934b963e6a40f7b681f86b3d.tar.gz
tmwa-edd67db458188a76934b963e6a40f7b681f86b3d.tar.bz2
tmwa-edd67db458188a76934b963e6a40f7b681f86b3d.tar.xz
tmwa-edd67db458188a76934b963e6a40f7b681f86b3d.zip
Disallow unchecked being casts
Despite the fact that that's what the code always did, it was sometimes wrong.
Diffstat (limited to 'src/map/atcommand.cpp')
-rw-r--r--src/map/atcommand.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index e4d1745..508209c 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -553,7 +553,7 @@ void atkillmonster_sub(dumb_ptr<block_list> bl, int flag)
{
nullpo_retv(bl);
- dumb_ptr<mob_data> md = bl->as_mob();
+ dumb_ptr<mob_data> md = bl->is_mob();
if (flag)
mob_damage(NULL, md, md->hp, 2);
else
@@ -2184,7 +2184,7 @@ void atlist_nearby_sub(dumb_ptr<block_list> bl, int fd)
nullpo_retv(bl);
FString buf = STRPRINTF(" - \"%s\"",
- bl->as_player()->status.name);
+ bl->is_player()->status.name);
clif_displaymessage(fd, buf);
}
@@ -5456,7 +5456,7 @@ int atcommand_summon(const int, dumb_ptr<map_session_data> sd,
y = sd->bl_y + random_::in(-5, 4);
id = mob_once_spawn(sd, MOB_THIS_MAP, x, y, JAPANESE_NAME, mob_id, 1, NpcEvent());
- dumb_ptr<mob_data> md = map_id_as_mob(id);
+ dumb_ptr<mob_data> md = map_id_is_mob(id);
if (md)
{
md->master_id = sd->bl_id;
@@ -5725,7 +5725,7 @@ int atcommand_jump_iterate(const int fd, dumb_ptr<map_session_data> sd,
{
dumb_ptr<map_session_data> pl_sd;
- pl_sd = map_id_as_player(sd->followtarget);
+ pl_sd = map_id_is_player(sd->followtarget);
if (pl_sd)
pl_sd = get_next(pl_sd);