From 634aeeb9d58b01f9de6632a014a063ef0c4cf31e Mon Sep 17 00:00:00 2001 From: Chuck Miller Date: Fri, 25 Dec 2009 05:00:31 -0500 Subject: Used the "indent" C formatting program from GNU to do some clean ups The command options used was: -nbad -bap -sc -bl -blf -bli0 -cli4 -cbi0 -di5 -nbc -bls -ip2 -nut -ts4 -bap -i4 -sob -npsl --- src/map/pc.h | 337 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 173 insertions(+), 164 deletions(-) (limited to 'src/map/pc.h') diff --git a/src/map/pc.h b/src/map/pc.h index 31d8c8a..ec5afb9 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -20,182 +20,191 @@ #define pc_isfalcon(sd) ((sd)->status.option&0x0010) #define pc_isriding(sd) ((sd)->status.option&0x0020) #define pc_isinvisible(sd) ((sd)->status.option&0x0040) -#define pc_is50overweight(sd) (sd->weight*2 >= sd->max_weight) +#define pc_is50overweight(sd) (sd->weight*2 >= sd->max_weight) #define pc_is90overweight(sd) (sd->weight*10 >= sd->max_weight*9) -void pc_touch_all_relevant_npcs(struct map_session_data *sd); /* Checks all npcs/warps at the same location to see whether they - ** should do something with the specified player. */ - -int pc_isGM(struct map_session_data *sd); -int pc_iskiller(struct map_session_data *src, struct map_session_data *target); // [MouseJstr] -int pc_getrefinebonus(int lv,int type); - -void pc_invisibility(struct map_session_data *sd, int enabled); // [Fate] -int pc_counttargeted(struct map_session_data *sd,struct block_list *src,int target_lv); -int pc_setrestartvalue(struct map_session_data *sd,int type); -int pc_makesavestatus(struct map_session_data *); -int pc_setnewpc(struct map_session_data*,int,int,int,int,int,int); -int pc_authok(int, int, time_t, short tmw_version, struct mmo_charstatus *); -int pc_authfail(int); - -int pc_isequip(struct map_session_data *sd,int n); -int pc_equippoint(struct map_session_data *sd,int n); - -int pc_breakweapon(struct map_session_data *sd); // weapon breaking [Valaris] -int pc_breakarmor(struct map_session_data *sd); // armor breaking [Valaris] - -int pc_checkskill(struct map_session_data *sd,int skill_id); -int pc_checkallowskill(struct map_session_data *sd); -int pc_checkequip(struct map_session_data *sd,int pos); - -int pc_checkoverhp(struct map_session_data*); -int pc_checkoversp(struct map_session_data*); - -int pc_can_reach(struct map_session_data*,int,int); -int pc_walktoxy(struct map_session_data*,int,int); -int pc_stop_walking(struct map_session_data*,int); -int pc_movepos(struct map_session_data*,int,int); -int pc_setpos(struct map_session_data*,char*,int,int,int); -int pc_setsavepoint(struct map_session_data*,char*,int,int); -int pc_randomwarp(struct map_session_data *sd,int type); -int pc_memo(struct map_session_data *sd,int i); - -int pc_checkadditem(struct map_session_data*,int,int); -int pc_inventoryblank(struct map_session_data*); -int pc_search_inventory(struct map_session_data *sd,int item_id); -int pc_payzeny(struct map_session_data*,int); -int pc_additem(struct map_session_data*,struct item*,int); -int pc_getzeny(struct map_session_data*,int); -int pc_delitem(struct map_session_data*,int,int,int); -int pc_checkitem(struct map_session_data*); -int pc_count_all_items(struct map_session_data* player, int item_id); -int pc_remove_items(struct map_session_data* player, int item_id, int count); - -int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amount); -int pc_cart_delitem(struct map_session_data *sd,int n,int amount,int type); -int pc_putitemtocart(struct map_session_data *sd,int idx,int amount); -int pc_getitemfromcart(struct map_session_data *sd,int idx,int amount); -int pc_cartitem_amount(struct map_session_data *sd,int idx,int amount); - -int pc_takeitem(struct map_session_data*,struct flooritem_data*); -int pc_dropitem(struct map_session_data*,int,int); - -int pc_checkweighticon(struct map_session_data *sd); - -int pc_calcstatus(struct map_session_data*,int); -int pc_bonus(struct map_session_data*,int,int); -int pc_bonus2(struct map_session_data *sd,int,int,int); -int pc_bonus3(struct map_session_data *sd,int,int,int,int); -int pc_skill(struct map_session_data*,int,int,int); - -int pc_insert_card(struct map_session_data *sd,int idx_card,int idx_equip); - -int pc_item_identify(struct map_session_data *sd,int idx); -int pc_steal_item(struct map_session_data *sd,struct block_list *bl); -int pc_steal_coin(struct map_session_data *sd,struct block_list *bl); - -int pc_modifybuyvalue(struct map_session_data*,int); -int pc_modifysellvalue(struct map_session_data*,int); - -int pc_attack(struct map_session_data*,int,int); -int pc_stopattack(struct map_session_data*); - -int pc_follow(struct map_session_data*, int); // [MouseJstr] - -int pc_checkbaselevelup(struct map_session_data *sd); -int pc_checkjoblevelup(struct map_session_data *sd); -int pc_gainexp(struct map_session_data*,int,int); +void pc_touch_all_relevant_npcs (struct map_session_data *sd); /* Checks all npcs/warps at the same location to see whether they + ** should do something with the specified player. */ + +int pc_isGM (struct map_session_data *sd); +int pc_iskiller (struct map_session_data *src, struct map_session_data *target); // [MouseJstr] +int pc_getrefinebonus (int lv, int type); + +void pc_invisibility (struct map_session_data *sd, int enabled); // [Fate] +int pc_counttargeted (struct map_session_data *sd, struct block_list *src, + int target_lv); +int pc_setrestartvalue (struct map_session_data *sd, int type); +int pc_makesavestatus (struct map_session_data *); +int pc_setnewpc (struct map_session_data *, int, int, int, int, int, int); +int pc_authok (int, int, time_t, short tmw_version, struct mmo_charstatus *); +int pc_authfail (int); + +int pc_isequip (struct map_session_data *sd, int n); +int pc_equippoint (struct map_session_data *sd, int n); + +int pc_breakweapon (struct map_session_data *sd); // weapon breaking [Valaris] +int pc_breakarmor (struct map_session_data *sd); // armor breaking [Valaris] + +int pc_checkskill (struct map_session_data *sd, int skill_id); +int pc_checkallowskill (struct map_session_data *sd); +int pc_checkequip (struct map_session_data *sd, int pos); + +int pc_checkoverhp (struct map_session_data *); +int pc_checkoversp (struct map_session_data *); + +int pc_can_reach (struct map_session_data *, int, int); +int pc_walktoxy (struct map_session_data *, int, int); +int pc_stop_walking (struct map_session_data *, int); +int pc_movepos (struct map_session_data *, int, int); +int pc_setpos (struct map_session_data *, char *, int, int, int); +int pc_setsavepoint (struct map_session_data *, char *, int, int); +int pc_randomwarp (struct map_session_data *sd, int type); +int pc_memo (struct map_session_data *sd, int i); + +int pc_checkadditem (struct map_session_data *, int, int); +int pc_inventoryblank (struct map_session_data *); +int pc_search_inventory (struct map_session_data *sd, int item_id); +int pc_payzeny (struct map_session_data *, int); +int pc_additem (struct map_session_data *, struct item *, int); +int pc_getzeny (struct map_session_data *, int); +int pc_delitem (struct map_session_data *, int, int, int); +int pc_checkitem (struct map_session_data *); +int pc_count_all_items (struct map_session_data *player, int item_id); +int pc_remove_items (struct map_session_data *player, int item_id, + int count); + +int pc_cart_additem (struct map_session_data *sd, struct item *item_data, + int amount); +int pc_cart_delitem (struct map_session_data *sd, int n, int amount, + int type); +int pc_putitemtocart (struct map_session_data *sd, int idx, int amount); +int pc_getitemfromcart (struct map_session_data *sd, int idx, int amount); +int pc_cartitem_amount (struct map_session_data *sd, int idx, int amount); + +int pc_takeitem (struct map_session_data *, struct flooritem_data *); +int pc_dropitem (struct map_session_data *, int, int); + +int pc_checkweighticon (struct map_session_data *sd); + +int pc_calcstatus (struct map_session_data *, int); +int pc_bonus (struct map_session_data *, int, int); +int pc_bonus2 (struct map_session_data *sd, int, int, int); +int pc_bonus3 (struct map_session_data *sd, int, int, int, int); +int pc_skill (struct map_session_data *, int, int, int); + +int pc_insert_card (struct map_session_data *sd, int idx_card, + int idx_equip); + +int pc_item_identify (struct map_session_data *sd, int idx); +int pc_steal_item (struct map_session_data *sd, struct block_list *bl); +int pc_steal_coin (struct map_session_data *sd, struct block_list *bl); + +int pc_modifybuyvalue (struct map_session_data *, int); +int pc_modifysellvalue (struct map_session_data *, int); + +int pc_attack (struct map_session_data *, int, int); +int pc_stopattack (struct map_session_data *); + +int pc_follow (struct map_session_data *, int); // [MouseJstr] + +int pc_checkbaselevelup (struct map_session_data *sd); +int pc_checkjoblevelup (struct map_session_data *sd); +int pc_gainexp (struct map_session_data *, int, int); #define PC_GAINEXP_REASON_KILLING 0 #define PC_GAINEXP_REASON_HEALING 1 #define PC_GAINEXP_REASON_SCRIPT 2 -int pc_gainexp_reason(struct map_session_data*,int,int, int reason); -int pc_extract_healer_exp(struct map_session_data*, int max); // [Fate] Used by healers: extract healer-xp from the target, return result (up to max) - -int pc_nextbaseexp(struct map_session_data *); -int pc_nextbaseafter(struct map_session_data *); // [Valaris] -int pc_nextjobexp(struct map_session_data *); -int pc_nextjobafter(struct map_session_data *); // [Valaris] -int pc_need_status_point(struct map_session_data *,int); -int pc_statusup(struct map_session_data*,int); -int pc_statusup2(struct map_session_data*,int,int); -int pc_skillup(struct map_session_data*,int); -int pc_allskillup(struct map_session_data*); -int pc_resetlvl(struct map_session_data*,int type); -int pc_resetstate(struct map_session_data*); -int pc_resetskill(struct map_session_data*); -int pc_equipitem(struct map_session_data*,int,int); -int pc_unequipitem(struct map_session_data*,int,int); -int pc_unequipinvyitem(struct map_session_data*,int,int); -int pc_checkitem(struct map_session_data*); -int pc_useitem(struct map_session_data*,int); - -int pc_damage(struct block_list *,struct map_session_data*,int); -int pc_heal(struct map_session_data *,int,int); -int pc_itemheal(struct map_session_data *sd,int hp,int sp); -int pc_percentheal(struct map_session_data *sd,int,int); -int pc_jobchange(struct map_session_data *,int, int); -int pc_setoption(struct map_session_data *,int); -int pc_setcart(struct map_session_data *sd,int type); -int pc_setfalcon(struct map_session_data *sd); -int pc_setriding(struct map_session_data *sd); -int pc_changelook(struct map_session_data *,int,int); -int pc_equiplookall(struct map_session_data *sd); - -int pc_readparam(struct map_session_data*,int); -int pc_setparam(struct map_session_data*,int,int); -int pc_readreg(struct map_session_data*,int); -int pc_setreg(struct map_session_data*,int,int); -char *pc_readregstr(struct map_session_data *sd,int reg); -int pc_setregstr(struct map_session_data *sd,int reg,char *str); -int pc_readglobalreg(struct map_session_data*,char*); -int pc_setglobalreg(struct map_session_data*,char*,int); -int pc_readaccountreg(struct map_session_data*,char*); -int pc_setaccountreg(struct map_session_data*,char*,int); -int pc_readaccountreg2(struct map_session_data*,char*); -int pc_setaccountreg2(struct map_session_data*,char*,int); -int pc_percentrefinery(struct map_session_data *sd,struct item *item); - -int pc_addeventtimer(struct map_session_data *sd,int tick,const char *name); -int pc_deleventtimer(struct map_session_data *sd,const char *name); -int pc_cleareventtimer(struct map_session_data *sd); -int pc_addeventtimercount(struct map_session_data *sd,const char *name,int tick); - -int pc_calc_pvprank(struct map_session_data *sd); -int pc_calc_pvprank_timer(int tid,unsigned int tick,int id,int data); - -int pc_ismarried(struct map_session_data *sd); -int pc_marriage(struct map_session_data *sd,struct map_session_data *dstsd); -int pc_divorce(struct map_session_data *sd); -struct map_session_data *pc_get_partner(struct map_session_data *sd); -int pc_set_gm_level(int account_id, int level); -void pc_setstand(struct map_session_data *sd); -void pc_cleanup(struct map_session_data *sd); // [Fate] Clean up after a logged-out PC - -struct pc_base_job{ - int job; //職業、ただし転生職や養子職の場合は元の職業を返す(廃プリ→プリ) - int type; //ノビ 0, 一次職 1, 二次職 2, スパノビ 3 - int upper; //通常 0, 転生 1, 養子 2 +int pc_gainexp_reason (struct map_session_data *, int, int, int reason); +int pc_extract_healer_exp (struct map_session_data *, int max); // [Fate] Used by healers: extract healer-xp from the target, return result (up to max) + +int pc_nextbaseexp (struct map_session_data *); +int pc_nextbaseafter (struct map_session_data *); // [Valaris] +int pc_nextjobexp (struct map_session_data *); +int pc_nextjobafter (struct map_session_data *); // [Valaris] +int pc_need_status_point (struct map_session_data *, int); +int pc_statusup (struct map_session_data *, int); +int pc_statusup2 (struct map_session_data *, int, int); +int pc_skillup (struct map_session_data *, int); +int pc_allskillup (struct map_session_data *); +int pc_resetlvl (struct map_session_data *, int type); +int pc_resetstate (struct map_session_data *); +int pc_resetskill (struct map_session_data *); +int pc_equipitem (struct map_session_data *, int, int); +int pc_unequipitem (struct map_session_data *, int, int); +int pc_unequipinvyitem (struct map_session_data *, int, int); +int pc_checkitem (struct map_session_data *); +int pc_useitem (struct map_session_data *, int); + +int pc_damage (struct block_list *, struct map_session_data *, int); +int pc_heal (struct map_session_data *, int, int); +int pc_itemheal (struct map_session_data *sd, int hp, int sp); +int pc_percentheal (struct map_session_data *sd, int, int); +int pc_jobchange (struct map_session_data *, int, int); +int pc_setoption (struct map_session_data *, int); +int pc_setcart (struct map_session_data *sd, int type); +int pc_setfalcon (struct map_session_data *sd); +int pc_setriding (struct map_session_data *sd); +int pc_changelook (struct map_session_data *, int, int); +int pc_equiplookall (struct map_session_data *sd); + +int pc_readparam (struct map_session_data *, int); +int pc_setparam (struct map_session_data *, int, int); +int pc_readreg (struct map_session_data *, int); +int pc_setreg (struct map_session_data *, int, int); +char *pc_readregstr (struct map_session_data *sd, int reg); +int pc_setregstr (struct map_session_data *sd, int reg, char *str); +int pc_readglobalreg (struct map_session_data *, char *); +int pc_setglobalreg (struct map_session_data *, char *, int); +int pc_readaccountreg (struct map_session_data *, char *); +int pc_setaccountreg (struct map_session_data *, char *, int); +int pc_readaccountreg2 (struct map_session_data *, char *); +int pc_setaccountreg2 (struct map_session_data *, char *, int); +int pc_percentrefinery (struct map_session_data *sd, struct item *item); + +int pc_addeventtimer (struct map_session_data *sd, int tick, + const char *name); +int pc_deleventtimer (struct map_session_data *sd, const char *name); +int pc_cleareventtimer (struct map_session_data *sd); +int pc_addeventtimercount (struct map_session_data *sd, const char *name, + int tick); + +int pc_calc_pvprank (struct map_session_data *sd); +int pc_calc_pvprank_timer (int tid, unsigned int tick, int id, int data); + +int pc_ismarried (struct map_session_data *sd); +int pc_marriage (struct map_session_data *sd, + struct map_session_data *dstsd); +int pc_divorce (struct map_session_data *sd); +struct map_session_data *pc_get_partner (struct map_session_data *sd); +int pc_set_gm_level (int account_id, int level); +void pc_setstand (struct map_session_data *sd); +void pc_cleanup (struct map_session_data *sd); // [Fate] Clean up after a logged-out PC + +struct pc_base_job +{ + int job; //職業、ただし転生職や養子職の場合は元の職業を返す(廃プリ→プリ) + int type; //ノビ 0, 一次職 1, 二次職 2, スパノビ 3 + int upper; //通常 0, 転生 1, 養子 2 }; -struct pc_base_job pc_calc_base_job(int b_class);//転生や養子職の元の職業を返す +struct pc_base_job pc_calc_base_job (int b_class); //転生や養子職の元の職業を返す -int pc_read_gm_account(int fd); -int pc_setinvincibletimer(struct map_session_data *sd,int); -int pc_delinvincibletimer(struct map_session_data *sd); -int pc_addspiritball(struct map_session_data *sd,int,int); -int pc_delspiritball(struct map_session_data *sd,int,int); -int pc_logout(struct map_session_data *sd); // [fate] Player logs out +int pc_read_gm_account (int fd); +int pc_setinvincibletimer (struct map_session_data *sd, int); +int pc_delinvincibletimer (struct map_session_data *sd); +int pc_addspiritball (struct map_session_data *sd, int, int); +int pc_delspiritball (struct map_session_data *sd, int, int); +int pc_logout (struct map_session_data *sd); // [fate] Player logs out -int do_init_pc(void); +int do_init_pc (void); -enum {ADDITEM_EXIST,ADDITEM_NEW,ADDITEM_OVERAMOUNT}; +enum +{ ADDITEM_EXIST, ADDITEM_NEW, ADDITEM_OVERAMOUNT }; // timer for night.day -int day_timer_tid; -int night_timer_tid; -int map_day_timer(int,unsigned int,int,int); // by [yor] -int map_night_timer(int,unsigned int,int,int); // by [yor] +int day_timer_tid; +int night_timer_tid; +int map_day_timer (int, unsigned int, int, int); // by [yor] +int map_night_timer (int, unsigned int, int, int); // by [yor] #endif - -- cgit v1.2.3-60-g2f50