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

Cleaned struct tokens for map_session_data and status_change (#7490)

Browse Source 
Fixes #7492
This commit is contained in:
Singe Horizontal
2022-12-16 19:16:29 +01:00
committed by GitHub
parent da375a04c1
commit 8eac71f57f
71 changed files with 3017 additions and 3017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/map/party.cpp
View File

@@ -39,7 +39,7 @@ int party_create_byscript;
* Fills the given party_member structure according to the sd provided.
* Used when creating/adding people to a party. [Skotlex]
*------------------------------------------*/
static void party_fill_member(struct party_member* member, struct map_session_data* sd, unsigned int leader)
static void party_fill_member(struct party_member* member, map_session_data* sd, unsigned int leader)
{
member->account_id = sd->status.account_id;
member->char_id = sd->status.char_id;
@@ -53,7 +53,7 @@ static void party_fill_member(struct party_member* member, struct map_session_da
/// Get the member_id of a party member.
/// Return -1 if not in party.
int party_getmemberid(struct party_data* p, struct map_session_data* sd)
int party_getmemberid(struct party_data* p, map_session_data* sd)
{
int member_id;
nullpo_retr(-1, p);
@@ -70,7 +70,7 @@ int party_getmemberid(struct party_data* p, struct map_session_data* sd)
/*==========================================
* Request an available sd of this party
*------------------------------------------*/
struct map_session_data* party_getavailablesd(struct party_data *p)
map_session_data* party_getavailablesd(struct party_data *p)
{
int i;
nullpo_retr(NULL, p);
@@ -141,7 +141,7 @@ struct party_data* party_searchname(const char* str)
return p;
}
int party_create(struct map_session_data *sd,char *name,int item,int item2)
int party_create(map_session_data *sd,char *name,int item,int item2)
{
struct party_member leader;
char tname[NAME_LENGTH];
@@ -165,7 +165,7 @@ int party_create(struct map_session_data *sd,char *name,int item,int item2)
void party_created(uint32 account_id,uint32 char_id,int fail,int party_id,char *name)
{
struct map_session_data *sd;
map_session_data *sd;
sd = map_id2sd(account_id);
@@ -201,7 +201,7 @@ int party_request_info(int party_id, uint32 char_id)
* Close trade window if party member is kicked when trade a party bound item
* @param sd
**/
static void party_trade_bound_cancel(struct map_session_data *sd) {
static void party_trade_bound_cancel(map_session_data *sd) {
#ifdef BOUND_ITEMS
nullpo_retv(sd);
if (sd->state.isBoundTrading&(1<<BOUND_PARTY))
@@ -216,7 +216,7 @@ int party_recv_noinfo(int party_id, uint32 char_id)
{
party_broken(party_id);
if( char_id != 0 ) { // requester
struct map_session_data* sd;
map_session_data* sd;
sd = map_charid2sd(char_id);
@@ -271,7 +271,7 @@ int party_recv_info(struct party* sp, uint32 char_id)
{
struct party_data* p;
struct party_member* member;
struct map_session_data* sd;
map_session_data* sd;
int removed[MAX_PARTY];// member_id in old data
int removed_count = 0;
int added[MAX_PARTY];// member_id in new data
@@ -382,7 +382,7 @@ int party_recv_info(struct party* sp, uint32 char_id)
}
///! TODO: Party invitation cross map-server through inter-server, so does with the reply.
int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
int party_invite(map_session_data *sd,map_session_data *tsd)
{
struct party_data *p;
int i;
@@ -452,9 +452,9 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
return 1;
}
int party_reply_invite(struct map_session_data *sd,int party_id,int flag)
int party_reply_invite(map_session_data *sd,int party_id,int flag)
{
struct map_session_data* tsd;
map_session_data* tsd;
struct party_member member;
if( sd->party_invite != party_id ) { // forged
@@ -493,7 +493,7 @@ int party_reply_invite(struct map_session_data *sd,int party_id,int flag)
//- Loads up party data if not in server
//- Sets up the pointer to him
//- Player must be authed/active and belong to a party before calling this method
void party_member_joined(struct map_session_data *sd)
void party_member_joined(map_session_data *sd)
{
struct party_data* p = party_search(sd->status.party_id);
int i;
@@ -515,7 +515,7 @@ void party_member_joined(struct map_session_data *sd)
/// flag: 0-success, 1-failure
int party_member_added(int party_id,uint32 account_id,uint32 char_id, int flag)
{
struct map_session_data *sd = map_id2sd(account_id),*sd2;
map_session_data *sd = map_id2sd(account_id),*sd2;
struct party_data *p = party_search(party_id);
int i;
@@ -570,7 +570,7 @@ int party_member_added(int party_id,uint32 account_id,uint32 char_id, int flag)
}
/// Party member 'sd' requesting kick of member with <account_id, name>.
int party_removemember(struct map_session_data* sd, uint32 account_id, char* name)
int party_removemember(map_session_data* sd, uint32 account_id, char* name)
{
struct party_data *p;
int i;
@@ -597,7 +597,7 @@ int party_removemember(struct map_session_data* sd, uint32 account_id, char* nam
return 1;
}
int party_removemember2(struct map_session_data *sd,uint32 char_id,int party_id)
int party_removemember2(map_session_data *sd,uint32 char_id,int party_id)
{
if( sd ) {
if( !sd->status.party_id )
@@ -622,7 +622,7 @@ int party_removemember2(struct map_session_data *sd,uint32 char_id,int party_id)
}
/// Party member 'sd' requesting exit from party.
int party_leave(struct map_session_data *sd)
int party_leave(map_session_data *sd)
{
struct party_data *p;
int i;
@@ -644,11 +644,11 @@ int party_leave(struct map_session_data *sd)
/// Invoked (from char-server) when a party member leaves the party.
int party_member_withdraw(int party_id, uint32 account_id, uint32 char_id, char *name, enum e_party_member_withdraw type)
{
struct map_session_data* sd = map_charid2sd(char_id);
map_session_data* sd = map_charid2sd(char_id);
struct party_data* p = party_search(party_id);
if( p ) {
struct map_session_data* party_sd = party_getavailablesd( p );
map_session_data* party_sd = party_getavailablesd( p );
if( party_sd != nullptr ){
clif_party_withdraw( *party_sd, account_id, name, type, PARTY );
@@ -721,7 +721,7 @@ int party_broken(int party_id)
return 1;
}
int party_changeoption(struct map_session_data *sd,int exp,int item)
int party_changeoption(map_session_data *sd,int exp,int item)
{
nullpo_ret(sd);
@@ -767,7 +767,7 @@ int party_setoption(struct party_data *party, int option, int flag)
int party_optionchanged(int party_id,uint32 account_id,int exp,int item,int flag)
{
struct party_data *p;
struct map_session_data *sd=map_id2sd(account_id);
map_session_data *sd=map_id2sd(account_id);
if( (p = party_search(party_id)) == NULL)
return 0;
@@ -784,7 +784,7 @@ int party_optionchanged(int party_id,uint32 account_id,int exp,int item,int flag
return 0;
}
int party_changeleader(struct map_session_data *sd, struct map_session_data *tsd, struct party_data *p)
int party_changeleader(map_session_data *sd, map_session_data *tsd, struct party_data *p)
{
int mi, tmi;
@@ -882,7 +882,7 @@ int party_recv_movemap(int party_id,uint32 account_id,uint32 char_id, unsigned s
return 0;
}
void party_send_movemap(struct map_session_data *sd)
void party_send_movemap(map_session_data *sd)
{
struct party_data *p;
@@ -916,12 +916,12 @@ void party_send_movemap(struct map_session_data *sd)
return;
}
void party_send_levelup(struct map_session_data *sd)
void party_send_levelup(map_session_data *sd)
{
intif_party_changemap(sd,1);
}
int party_send_logout(struct map_session_data *sd)
int party_send_logout(map_session_data *sd)
{
struct party_data *p;
int i;
@@ -942,7 +942,7 @@ int party_send_logout(struct map_session_data *sd)
return 1;
}
int party_send_message(struct map_session_data *sd,const char *mes,int len)
int party_send_message(map_session_data *sd,const char *mes,int len)
{
if(sd->status.party_id == 0)
return 0;
@@ -964,10 +964,10 @@ int party_recv_message(int party_id,uint32 account_id,const char *mes,int len)
return 0;
}
int party_skill_check(struct map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv)
int party_skill_check(map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv)
{
struct party_data *p;
struct map_session_data *p_sd;
map_session_data *p_sd;
int i;
if(!party_id || (p = party_search(party_id)) == NULL)
@@ -1033,7 +1033,7 @@ TIMER_FUNC(party_send_xy_timer){
// for each member of this party
for( i = 0; i < MAX_PARTY; i++ ) {
struct map_session_data* sd = p->data[i].sd;
map_session_data* sd = p->data[i].sd;
if( !sd )
continue;
@@ -1082,7 +1082,7 @@ int party_send_xy_clear(struct party_data *p)
**/
void party_exp_share(struct party_data* p, struct block_list* src, t_exp base_exp, t_exp job_exp, int zeny)
{
struct map_session_data* sd[MAX_PARTY];
map_session_data* sd[MAX_PARTY];
unsigned int i, c;
#ifdef RENEWAL_EXP
TBL_MOB *md = BL_CAST(BL_MOB, src);
@@ -1140,7 +1140,7 @@ void party_exp_share(struct party_data* p, struct block_list* src, t_exp base_ex
}
//Does party loot. first_charid holds the charid of the player who has time priority to take the item.
int party_share_loot(struct party_data* p, struct map_session_data* sd, struct item* item, int first_charid)
int party_share_loot(struct party_data* p, map_session_data* sd, struct item* item, int first_charid)
{
TBL_PC* target = NULL;
int i;
@@ -1207,7 +1207,7 @@ int party_share_loot(struct party_data* p, struct map_session_data* sd, struct i
return 0;
}
int party_send_dot_remove(struct map_session_data *sd)
int party_send_dot_remove(map_session_data *sd)
{
if (sd->status.party_id)
clif_party_xy_remove(sd);
@@ -1223,7 +1223,7 @@ int party_send_dot_remove(struct map_session_data *sd)
*/
int party_sub_count(struct block_list *bl, va_list ap)
{
struct map_session_data *sd = (TBL_PC *)bl;
map_session_data *sd = (TBL_PC *)bl;
if (sd->state.autotrade)
return 0;
@@ -1242,7 +1242,7 @@ int party_sub_count(struct block_list *bl, va_list ap)
*/
int party_sub_count_class(struct block_list *bl, va_list ap)
{
struct map_session_data *sd = (TBL_PC *)bl;
map_session_data *sd = (TBL_PC *)bl;
unsigned int mask = va_arg(ap, unsigned int);
unsigned int mapid_class = va_arg(ap, unsigned int);
@@ -1256,7 +1256,7 @@ int party_sub_count_class(struct block_list *bl, va_list ap)
}
/// Executes 'func' for each party member on the same map and in range (0:whole map)
int party_foreachsamemap(int (*func)(struct block_list*,va_list),struct map_session_data *sd,int range,...)
int party_foreachsamemap(int (*func)(struct block_list*,va_list),map_session_data *sd,int range,...)
{
struct party_data *p;
int i;
@@ -1276,7 +1276,7 @@ int party_foreachsamemap(int (*func)(struct block_list*,va_list),struct map_sess
y1 = sd->bl.y+range;
for(i = 0; i < MAX_PARTY; i++) {
struct map_session_data *psd = p->data[i].sd;
map_session_data *psd = p->data[i].sd;
if(!psd)
continue;
@@ -1319,7 +1319,7 @@ static struct party_booking_ad_info* create_party_booking_data(void)
return pb_ad;
}
void party_booking_register(struct map_session_data *sd, short level, short mapid, short* job)
void party_booking_register(map_session_data *sd, short level, short mapid, short* job)
{
struct party_booking_ad_info *pb_ad;
int i;
@@ -1348,7 +1348,7 @@ void party_booking_register(struct map_session_data *sd, short level, short mapi
clif_PartyBookingInsertNotify(sd, pb_ad); // Notice
}
void party_booking_update(struct map_session_data *sd, short* job)
void party_booking_update(map_session_data *sd, short* job)
{
int i;
struct party_booking_ad_info *pb_ad;
@@ -1369,7 +1369,7 @@ void party_booking_update(struct map_session_data *sd, short* job)
clif_PartyBookingUpdateNotify(sd, pb_ad);
}
void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount)
void party_booking_search(map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount)
{
struct party_booking_ad_info *pb_ad;
int i, count=0;
@@ -1407,7 +1407,7 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid,
clif_PartyBookingSearchAck(sd->fd, result_list, count, more_result);
}
bool party_booking_delete(struct map_session_data *sd)
bool party_booking_delete(map_session_data *sd)
{
struct party_booking_ad_info* pb_ad;