summaryrefslogtreecommitdiff
path: root/src/map/intif.c
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/intif.c
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/intif.c')
-rw-r--r--src/map/intif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/intif.c b/src/map/intif.c
index 634735bd6..cae2561a0 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -466,8 +466,8 @@ int intif_party_changemap(struct map_session_data *sd,int online) {
if(!sd)
return 0;
- if( (m=iMap->mapindex2mapid(sd->mapindex)) >= 0 && map[m].instance_id >= 0 )
- mapindex = map_id2index(map[m].instance_src_map);
+ if( (m=iMap->mapindex2mapid(sd->mapindex)) >= 0 && maplist[m].instance_id >= 0 )
+ mapindex = map_id2index(maplist[m].instance_src_map);
else
mapindex = sd->mapindex;