summaryrefslogtreecommitdiff
path: root/src/map/mob.h
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-09-26 02:34:45 +0200
committerHaru <haru@dotalux.com>2013-09-26 02:34:45 +0200
commit3e5bca5a3df07320ff5c41edbb282df041c36f66 (patch)
treec593fcf36c9113cd750013fff084052110cf56ce /src/map/mob.h
parentafcad494411995396b906f214d1c4ffcf485cc0a (diff)
downloadhercules-3e5bca5a3df07320ff5c41edbb282df041c36f66.tar.gz
hercules-3e5bca5a3df07320ff5c41edbb282df041c36f66.tar.bz2
hercules-3e5bca5a3df07320ff5c41edbb282df041c36f66.tar.xz
hercules-3e5bca5a3df07320ff5c41edbb282df041c36f66.zip
Renamed variables that would conflict with a rename of iMap to map
Note to plugin developers: if you were importing the "map", you'll need to change it to "maplist" Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/mob.h')
-rw-r--r--src/map/mob.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mob.h b/src/map/mob.h
index 4ac8f7bcb..f4cbd77c6 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -245,8 +245,8 @@ struct item_drop_list {
#define mob_stop_walking(md, type) unit->stop_walking(&(md)->bl, type)
#define mob_stop_attack(md) unit->stop_attack(&(md)->bl)
-#define mob_is_battleground(md) ( map[(md)->bl.m].flag.battleground && ((md)->class_ == MOBID_BARRICADE2 || ((md)->class_ >= MOBID_FOOD_STOR && (md)->class_ <= MOBID_PINK_CRYST)) )
-#define mob_is_gvg(md) (map[(md)->bl.m].flag.gvg_castle && ( (md)->class_ == MOBID_EMPERIUM || (md)->class_ == MOBID_BARRICADE1 || (md)->class_ == MOBID_GUARIDAN_STONE1 || (md)->class_ == MOBID_GUARIDAN_STONE2) )
+#define mob_is_battleground(md) ( maplist[(md)->bl.m].flag.battleground && ((md)->class_ == MOBID_BARRICADE2 || ((md)->class_ >= MOBID_FOOD_STOR && (md)->class_ <= MOBID_PINK_CRYST)) )
+#define mob_is_gvg(md) (maplist[(md)->bl.m].flag.gvg_castle && ( (md)->class_ == MOBID_EMPERIUM || (md)->class_ == MOBID_BARRICADE1 || (md)->class_ == MOBID_GUARIDAN_STONE1 || (md)->class_ == MOBID_GUARIDAN_STONE2) )
#define mob_is_treasure(md) (((md)->class_ >= MOBID_TREAS01 && (md)->class_ <= MOBID_TREAS40) || ((md)->class_ >= MOBID_TREAS41 && (md)->class_ <= MOBID_TREAS49))
struct mob_interface {