diff options
| author | Haru <haru@dotalux.com> | 2013-09-26 02:34:45 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-09-26 02:34:45 +0200 |
| commit | 3e5bca5a3df07320ff5c41edbb282df041c36f66 (patch) | |
| tree | c593fcf36c9113cd750013fff084052110cf56ce /src/map/battleground.c | |
| parent | afcad494411995396b906f214d1c4ffcf485cc0a (diff) | |
| download | hercules-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/battleground.c')
| -rw-r--r-- | src/map/battleground.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battleground.c b/src/map/battleground.c index 981264774..db6d6cd5a 100644 --- a/src/map/battleground.c +++ b/src/map/battleground.c @@ -91,8 +91,8 @@ int bg_team_join(int bg_id, struct map_session_data *sd) { bgd->members[i].x = sd->bl.x; bgd->members[i].y = sd->bl.y; /* populate 'where i came from' */ - if(map[sd->bl.m].flag.nosave || map[sd->bl.m].instance_id >= 0) { - struct map_data *m=&map[sd->bl.m]; + if(maplist[sd->bl.m].flag.nosave || maplist[sd->bl.m].instance_id >= 0) { + struct map_data *m=&maplist[sd->bl.m]; if(m->save.map) memcpy(&bgd->members[i].source,&m->save,sizeof(struct point)); else |