diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/map.c | 2 | ||||
| -rw-r--r-- | src/map/party.c | 27 |
2 files changed, 12 insertions, 17 deletions
diff --git a/src/map/map.c b/src/map/map.c index 7bd04015b..3f37c430e 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2540,7 +2540,7 @@ int map_delmap(char *mapname) { * Initiate maps loading stage *-------------------------------------- */ -int map_readallmaps() +int map_readallmaps (void) { int i; int maps_removed = 0; diff --git a/src/map/party.c b/src/map/party.c index 51408c79d..777a2ab3b 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -520,22 +520,9 @@ void party_send_movemap(struct map_session_data *sd) intif_party_changemap(sd,1); p=party_search(sd->status.party_id); - if (p && sd->fd) { - //Send dots of other party members to this char. [Skotlex] - for(i=0; i < MAX_PARTY; i++) { - if (!p->data[i].sd || p->data[i].sd == sd || - p->data[i].sd->bl.m != sd->bl.m) - continue; - clif_party_xy_single(sd->fd, p->data[i].sd); - } - } - - if( sd->state.party_sent ) - return; + if (!p) return; - party_check_conflict(sd); - - if(p){ + if(!sd->state.party_sent) { party_check_member(&p->party); if(sd->status.party_id==p->party.party_id){ clif_party_member_info(p,sd); @@ -544,7 +531,15 @@ void party_send_movemap(struct map_session_data *sd) sd->state.party_sent=1; } } - + + if (sd->fd) { //Send dots of other party members to this char. [Skotlex] + for(i=0; i < MAX_PARTY; i++) { + if (p->data[i].sd && + p->data[i].sd != sd && + p->data[i].sd->bl.m == sd->bl.m) + clif_party_xy_single(sd->fd, p->data[i].sd); + } + } return; } |