From 60a426c0742b3e7d8c5b557c7578df6eeeea377b Mon Sep 17 00:00:00 2001 From: brianluau Date: Wed, 5 Dec 2012 02:53:33 +0000 Subject: - Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924). [16969:16991/trunk/src/] will be re-committed in the next 24 hours. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/party.h | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'src/map/party.h') diff --git a/src/map/party.h b/src/map/party.h index 49f6513e9..9fde5a6a4 100644 --- a/src/map/party.h +++ b/src/map/party.h @@ -16,43 +16,43 @@ struct item; #define PARTY_BOOKING_RESULTS 10 struct party_member_data { - struct map_session_data *sd; - unsigned int hp; //For HP,x,y refreshing. - unsigned short x, y; + struct map_session_data *sd; + unsigned int hp; //For HP,x,y refreshing. + unsigned short x, y; }; struct party_data { - struct party party; - struct party_member_data data[MAX_PARTY]; - uint8 itemc; //For item distribution, position of last picker in party - unsigned int instance_id; - struct { - unsigned monk : 1; //There's at least one monk in party? - unsigned sg : 1; //There's at least one Star Gladiator in party? - unsigned snovice :1; //There's a Super Novice - unsigned tk : 1; //There's a taekwon - } state; + struct party party; + struct party_member_data data[MAX_PARTY]; + uint8 itemc; //For item distribution, position of last picker in party + unsigned int instance_id; + struct { + unsigned monk : 1; //There's at least one monk in party? + unsigned sg : 1; //There's at least one Star Gladiator in party? + unsigned snovice :1; //There's a Super Novice + unsigned tk : 1; //There's a taekwon + } state; }; struct party_booking_detail { - short level; + short level; short mapid; short job[PARTY_BOOKING_JOBS]; }; struct party_booking_ad_info { - unsigned long index; - char charname[NAME_LENGTH]; - long starttime; - struct party_booking_detail p_detail; + unsigned long index; + char charname[NAME_LENGTH]; + long starttime; + struct party_booking_detail p_detail; }; void do_init_party(void); void do_final_party(void); -struct party_data *party_search(int party_id); -struct party_data *party_searchname(const char *str); -int party_getmemberid(struct party_data *p, struct map_session_data *sd); -struct map_session_data *party_getavailablesd(struct party_data *p); +struct party_data* party_search(int party_id); +struct party_data* party_searchname(const char* str); +int party_getmemberid(struct party_data* p, struct map_session_data* sd); +struct map_session_data* party_getavailablesd(struct party_data *p); int party_create(struct map_session_data *sd,char *name, int item, int item2); void party_created(int account_id,int char_id,int fail,int party_id,char *name); @@ -65,7 +65,7 @@ int party_removemember(struct map_session_data *sd,int account_id,char *name); int party_member_withdraw(int party_id,int account_id,int char_id); void party_reply_invite(struct map_session_data *sd,int party_id,int flag); int party_recv_noinfo(int party_id, int char_id); -int party_recv_info(struct party *sp, int char_id); +int party_recv_info(struct party* sp, int char_id); int party_recv_movemap(int party_id,int account_id,int char_id, unsigned short map,int online,int lv); int party_broken(int party_id); int party_optionchanged(int party_id,int account_id,int exp,int item,int flag); @@ -79,7 +79,7 @@ int party_recv_message(int party_id,int account_id,const char *mes,int len); int party_skill_check(struct map_session_data *sd, int party_id, int skillid, int skilllv); int party_send_xy_clear(struct party_data *p); int party_exp_share(struct party_data *p,struct block_list *src,unsigned int base_exp,unsigned int job_exp,int zeny); -int party_share_loot(struct party_data *p, struct map_session_data *sd, struct item *item_data, int first_charid); +int party_share_loot(struct party_data* p, struct map_session_data* sd, struct item* item_data, int first_charid); int party_send_dot_remove(struct map_session_data *sd); int party_sub_count(struct block_list *bl, va_list ap); int party_foreachsamemap(int (*func)(struct block_list *,va_list),struct map_session_data *sd,int range,...); @@ -87,8 +87,8 @@ int party_foreachsamemap(int (*func)(struct block_list *,va_list),struct map_ses /*========================================== * Party Booking in KRO [Spiria] *------------------------------------------*/ -void party_booking_register(struct map_session_data *sd, short level, short mapid, short *job); -void party_booking_update(struct map_session_data *sd, short *job); +void party_booking_register(struct map_session_data *sd, short level, short mapid, short* job); +void party_booking_update(struct map_session_data *sd, short* job); void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount); bool party_booking_delete(struct map_session_data *sd); -- cgit v1.2.3-70-g09d2