Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some packets for 2022 clients (#7276)

Browse Source 
Migrates a few packets from FIFO to structs.
Migrates friendlist to struct and fixed invalid version check.
Added a new guild related packet that does nothing for the time being.
Synced to latest Hercules' packet definitions.
Fixed name of ZC_SOULENERGY.

Thanks to @Dia and @Pokye.
This commit is contained in:
Lemongrass3110
2022-09-22 01:50:24 +02:00
committed by GitHub
parent 5ea44e7c0e
commit fa4666d7af
15 changed files with 826 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/map/party.cpp
View File

@@ -153,7 +153,7 @@ int party_create(struct map_session_data *sd,char *name,int item,int item2)
return 0;
if( sd->status.party_id > 0 || sd->party_joining || sd->party_creating ) { // already associated with a party
clif_party_created(sd,2);
clif_party_created( *sd, 2 );
return -2;
}
@@ -179,7 +179,7 @@ void party_created(uint32 account_id,uint32 char_id,int fail,int party_id,char *
if( !fail ) {
sd->status.party_id = party_id;
clif_party_created(sd,0); // Success message
clif_party_created( *sd, 0 ); // Success message
achievement_update_objective(sd, AG_PARTY, 1, 1);
@@ -189,7 +189,7 @@ void party_created(uint32 account_id,uint32 char_id,int fail,int party_id,char *
party_create_byscript = 0;
}
} else
clif_party_created(sd,1); // "party name already exists"
clif_party_created( *sd, 1 ); // "party name already exists"
}
int party_request_info(int party_id, uint32 char_id)
@@ -355,12 +355,13 @@ int party_recv_info(struct party* sp, uint32 char_id)
continue;// not online
clif_name_area(&sd->bl); //Update other people's display. [Skotlex]
clif_party_member_info(p,sd);
clif_party_member_info( *p, *sd );
// Only send this on party creation, otherwise it will be sent by party_send_movemap [Lemongrass]
if( sd->party_creating ){
clif_party_option(p,sd,0x100);
}
clif_party_info(p,NULL);
clif_party_info( *p );
if (p->instance_id > 0)
instance_reqinfo(sd, p->instance_id);
@@ -368,7 +369,7 @@ int party_recv_info(struct party* sp, uint32 char_id)
// If a player was renamed, make sure to resend the party information
if( rename ){
clif_party_info(p,NULL);
clif_party_info( *p );
}
if( char_id != 0 ) { // requester
@@ -402,7 +403,7 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
if (tsd && battle_config.block_account_in_same_party) {
ARR_FIND(0, MAX_PARTY, i, p->party.member[i].account_id == tsd->status.account_id);
if (i < MAX_PARTY) {
clif_party_invite_reply(sd, tsd->status.name, PARTY_REPLY_DUAL);
clif_party_invite_reply( *sd, tsd->status.name, PARTY_REPLY_DUAL );
return 0;
}
}
@@ -411,7 +412,7 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
ARR_FIND(0, MAX_PARTY, i, p->party.member[i].account_id == 0);
if( i == MAX_PARTY ) {
clif_party_invite_reply(sd, (tsd?tsd->status.name:""), PARTY_REPLY_FULL);
clif_party_invite_reply( *sd, ( tsd ? tsd->status.name : "" ), PARTY_REPLY_FULL );
return 0;
}
@@ -422,32 +423,32 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
}
if( tsd == NULL) {
clif_party_invite_reply(sd, "", PARTY_REPLY_OFFLINE);
clif_party_invite_reply( *sd, "", PARTY_REPLY_OFFLINE );
return 0;
}
if(!battle_config.invite_request_check) {
if (tsd->guild_invite>0 || tsd->trade_partner || tsd->adopt_invite) {
clif_party_invite_reply(sd,tsd->status.name,PARTY_REPLY_JOIN_OTHER_PARTY);
clif_party_invite_reply( *sd, tsd->status.name, PARTY_REPLY_JOIN_OTHER_PARTY );
return 0;
}
}
if (!tsd->fd) { //You can't invite someone who has already disconnected.
clif_party_invite_reply(sd,tsd->status.name,PARTY_REPLY_REJECTED);
clif_party_invite_reply( *sd, tsd->status.name, PARTY_REPLY_REJECTED );
return 0;
}
if( tsd->status.party_id > 0 || tsd->party_invite > 0 )
{// already associated with a party
clif_party_invite_reply(sd,tsd->status.name,PARTY_REPLY_JOIN_OTHER_PARTY);
clif_party_invite_reply( *sd, tsd->status.name, PARTY_REPLY_JOIN_OTHER_PARTY );
return 0;
}
tsd->party_invite=sd->status.party_id;
tsd->party_invite_account=sd->status.account_id;
clif_party_invite(sd,tsd);
clif_party_invite( *sd, *tsd );
return 1;
}
@@ -482,7 +483,7 @@ int party_reply_invite(struct map_session_data *sd,int party_id,int flag)
sd->party_invite_account = 0;
if( tsd != NULL )
clif_party_invite_reply(tsd,sd->status.name,PARTY_REPLY_REJECTED);
clif_party_invite_reply( *tsd, sd->status.name, PARTY_REPLY_REJECTED );
}
return 0;
@@ -538,28 +539,28 @@ int party_member_added(int party_id,uint32 account_id,uint32 char_id, int flag)
if( flag ) { // failed
if( sd2 != NULL )
clif_party_invite_reply(sd2,sd->status.name,PARTY_REPLY_FULL);
clif_party_invite_reply( *sd2, sd->status.name, PARTY_REPLY_FULL );
return 0;
}
sd->status.party_id = party_id;
clif_party_member_info(p,sd);
clif_party_member_info( *p, *sd );
clif_party_option(p,sd,0x100);
clif_party_info(p,sd);
clif_party_info( *p, sd );
if( sd2 != NULL )
clif_party_invite_reply(sd2,sd->status.name,PARTY_REPLY_ACCEPTED);
clif_party_invite_reply( *sd2, sd->status.name, PARTY_REPLY_ACCEPTED );
for( i = 0; i < ARRAYLENGTH(p->data); ++i ) { // hp of the other party members
sd2 = p->data[i].sd;
if( sd2 && sd2->status.account_id != account_id && sd2->status.char_id != char_id )
clif_hpmeter_single(sd->fd, sd2->bl.id, sd2->battle_status.hp, sd2->battle_status.max_hp);
clif_hpmeter_single( *sd, sd2->bl.id, sd2->battle_status.hp, sd2->battle_status.max_hp );
}
clif_party_hp(sd);
clif_party_xy(sd);
clif_party_hp( *sd );
clif_party_xy( *sd );
clif_name_area(&sd->bl); //Update char name's display [Skotlex]
if (p->instance_id > 0)
@@ -647,8 +648,13 @@ int party_member_withdraw(int party_id, uint32 account_id, uint32 char_id, char
struct party_data* p = party_search(party_id);
if( p ) {
struct map_session_data* party_sd = party_getavailablesd( p );
if( party_sd != nullptr ){
clif_party_withdraw( *party_sd, account_id, name, type, PARTY );
}
int i;
clif_party_withdraw(party_getavailablesd(p), account_id, name, type, PARTY);
ARR_FIND( 0, MAX_PARTY, i, p->party.member[i].account_id == account_id && p->party.member[i].char_id == char_id );
if( i < MAX_PARTY ) {
memset(&p->party.member[i], 0, sizeof(p->party.member[0]));
@@ -704,8 +710,8 @@ int party_broken(int party_id)
instance_destroy( p->instance_id );
for( i = 0; i < MAX_PARTY; i++ ) {
if( p->data[i].sd != NULL ) {
clif_party_withdraw(p->data[i].sd,p->party.member[i].account_id,p->party.member[i].name,PARTY_MEMBER_WITHDRAW_EXPEL,SELF);
if( p->data[i].sd != nullptr ) {
clif_party_withdraw( *p->data[i].sd, p->party.member[i].account_id, p->party.member[i].name, PARTY_MEMBER_WITHDRAW_EXPEL, SELF );
p->data[i].sd->status.party_id=0;
}
}
@@ -838,7 +844,7 @@ int party_changeleader(struct map_session_data *sd, struct map_session_data *tsd
// Update info.
intif_party_leaderchange(p->party.party_id,p->party.member[tmi].account_id,p->party.member[tmi].char_id);
clif_party_info(p,NULL);
clif_party_info( *p );
return 1;
}
@@ -871,7 +877,7 @@ int party_recv_movemap(int party_id,uint32 account_id,uint32 char_id, unsigned s
//Check if they still exist on this map server
p->data[i].sd = party_sd_check(party_id, account_id, char_id);
clif_party_info(p,NULL);
clif_party_info( *p );
return 0;
}
@@ -891,8 +897,8 @@ void party_send_movemap(struct map_session_data *sd)
if(sd->state.connect_new) {
//Note that this works because this function is invoked before connect_new is cleared.
clif_party_option(p,sd,0x100);
clif_party_info(p,sd);
clif_party_member_info(p,sd);
clif_party_info( *p, sd );
clif_party_member_info( *p, *sd );
}
if (sd->fd) { // synchronize minimap positions with the rest of the party
@@ -902,8 +908,8 @@ void party_send_movemap(struct map_session_data *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);
clif_party_xy_single(p->data[i].sd->fd, sd);
clif_party_xy_single( *sd, *p->data[i].sd );
clif_party_xy_single( *p->data[i].sd, *sd );
}
}
}
@@ -954,7 +960,7 @@ int party_recv_message(int party_id,uint32 account_id,const char *mes,int len)
struct party_data *p;
if( (p=party_search(party_id))==NULL)
return 0;
clif_party_message(p,account_id,mes,len);
clif_party_message( *p, account_id, mes, len );
return 0;
}
@@ -1033,13 +1039,13 @@ TIMER_FUNC(party_send_xy_timer){
continue;
if( p->data[i].x != sd->bl.x || p->data[i].y != sd->bl.y ) { // perform position update
clif_party_xy(sd);
clif_party_xy( *sd );
p->data[i].x = sd->bl.x;
p->data[i].y = sd->bl.y;
}
if (battle_config.party_hp_mode && p->data[i].hp != sd->battle_status.hp) { // perform hp update
clif_party_hp(sd);
clif_party_hp( *sd );
p->data[i].hp = sd->battle_status.hp;
}
}