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/party.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/party.c')
| -rw-r--r-- | src/map/party.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/party.c b/src/map/party.c index 88d6cc0bf..2682cf03b 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -665,8 +665,7 @@ bool party_changeleader(struct map_session_data *sd, struct map_session_data *ts return false; } - if( map[sd->bl.m].flag.partylock ) - { + if( maplist[sd->bl.m].flag.partylock ) { clif->message(sd->fd, msg_txt(287)); return false; } @@ -707,7 +706,7 @@ bool party_changeleader(struct map_session_data *sd, struct map_session_data *ts /// - changes maps /// - logs in or out /// - gains a level (disabled) -int party_recv_movemap(int party_id,int account_id,int char_id, unsigned short map,int online,int lv) +int party_recv_movemap(int party_id,int account_id,int char_id, unsigned short mapid,int online,int lv) { struct party_member* m; struct party_data* p; @@ -725,7 +724,7 @@ int party_recv_movemap(int party_id,int account_id,int char_id, unsigned short m } m = &p->party.member[i]; - m->map = map; + m->map = mapid; m->online = online; m->lv = lv; //Check if they still exist on this map server |