- Cleaned up the implementation of party_send_movemap, it should fix the client receiving the party-mate positions before receiving the party information when you first log on.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9994 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-03-12 19:02:20 +00:00
parent 3035c863f9
commit d25c9daa47
2 changed files with 12 additions and 17 deletions

View File

@ -2540,7 +2540,7 @@ int map_delmap(char *mapname) {
* Initiate maps loading stage * Initiate maps loading stage
*-------------------------------------- *--------------------------------------
*/ */
int map_readallmaps() int map_readallmaps (void)
{ {
int i; int i;
int maps_removed = 0; int maps_removed = 0;

View File

@ -520,22 +520,9 @@ void party_send_movemap(struct map_session_data *sd)
intif_party_changemap(sd,1); intif_party_changemap(sd,1);
p=party_search(sd->status.party_id); p=party_search(sd->status.party_id);
if (p && sd->fd) { if (!p) return;
//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 ) if(!sd->state.party_sent) {
return;
party_check_conflict(sd);
if(p){
party_check_member(&p->party); party_check_member(&p->party);
if(sd->status.party_id==p->party.party_id){ if(sd->status.party_id==p->party.party_id){
clif_party_member_info(p,sd); clif_party_member_info(p,sd);
@ -545,6 +532,14 @@ void party_send_movemap(struct map_session_data *sd)
} }
} }
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; return;
} }