diff options
| author | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
| commit | 13afb7e0bf35bacc9c90c7dffe34120ddd2fd099 (patch) | |
| tree | 180c739ac69aceab8ce4cc6151030539a32ac8c3 /src/map/intif.c | |
| parent | 1114eb3da58b078258a824424fef687a1ccee90c (diff) | |
| parent | 66979ef89363c03e3cc02d63feb5248836daff4e (diff) | |
| download | hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.gz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.bz2 hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.xz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Conflicts:
src/map/chrif.c
src/map/clif.c
src/map/homunculus.c
src/map/pet.c
src/map/script.c
src/map/skill.c
src/map/status.c
All clear.
Diffstat (limited to 'src/map/intif.c')
| -rw-r--r-- | src/map/intif.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/intif.c b/src/map/intif.c index ac1471d23..634735bd6 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -458,8 +458,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) -{ +int intif_party_changemap(struct map_session_data *sd,int online) { int16 m, mapindex; if (intif->CheckForCharServer()) @@ -468,7 +467,7 @@ int intif_party_changemap(struct map_session_data *sd,int online) return 0; if( (m=iMap->mapindex2mapid(sd->mapindex)) >= 0 && map[m].instance_id >= 0 ) - mapindex = map[map[m].instance_src_map].index; + mapindex = map_id2index(map[m].instance_src_map); else mapindex = sd->mapindex; |