diff options
| author | Haru <haru@dotalux.com> | 2013-12-11 15:01:00 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-12-11 15:03:52 +0100 |
| commit | 68d6c8bc110bbecd39c47b0e00445b8b4b5eb278 (patch) | |
| tree | 98804fe393e6559399e5ff0c86a73026c889a1f8 /src/map/intif.c | |
| parent | 27cf11151de917892b22794c1aa798620a484850 (diff) | |
| download | hercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.tar.gz hercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.tar.bz2 hercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.tar.xz hercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.zip | |
Corrected some local 'mapindex' variables shadowing the global one
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/intif.c')
| -rw-r--r-- | src/map/intif.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/intif.c b/src/map/intif.c index 3779eaa21..df7a16db7 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -447,7 +447,7 @@ int intif_party_leave(int party_id,int account_id, int char_id) // Request keeping party for new map ?? int intif_party_changemap(struct map_session_data *sd,int online) { - int16 m, mapindex; + int16 m, map_index; if (intif->CheckForCharServer()) return 0; @@ -455,16 +455,16 @@ int intif_party_changemap(struct map_session_data *sd,int online) { return 0; if( (m=map->mapindex2mapid(sd->mapindex)) >= 0 && map->list[m].instance_id >= 0 ) - mapindex = map_id2index(map->list[m].instance_src_map); + map_index = map_id2index(map->list[m].instance_src_map); else - mapindex = sd->mapindex; + map_index = sd->mapindex; WFIFOHEAD(inter_fd,19); WFIFOW(inter_fd,0)=0x3025; WFIFOL(inter_fd,2)=sd->status.party_id; WFIFOL(inter_fd,6)=sd->status.account_id; WFIFOL(inter_fd,10)=sd->status.char_id; - WFIFOW(inter_fd,14)=mapindex; + WFIFOW(inter_fd,14)=map_index; WFIFOB(inter_fd,16)=online; WFIFOW(inter_fd,17)=sd->status.base_level; WFIFOSET(inter_fd,19); |