diff options
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 6384c292d..1cc81eb9c 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -74,7 +74,7 @@ struct s_addeffectonskill { unsigned char target; }; -struct s_add_drop { +struct s_add_drop { short id, group; int race, rate; }; @@ -165,7 +165,7 @@ struct map_session_data { int packet_ver; // 5: old, 6: 7july04, 7: 13july04, 8: 26july04, 9: 9aug04/16aug04/17aug04, 10: 6sept04, 11: 21sept04, 12: 18oct04, 13: 25oct04 ... 18 struct mmo_charstatus status; struct registry save_reg; - + struct item_data* inventory_data[MAX_INVENTORY]; // direct pointers to itemdb entries (faster than doing item_id lookups) short equip_index[14]; unsigned int weight,max_weight; @@ -216,7 +216,7 @@ struct map_session_data { unsigned int cansendmail_tick; // [Mail System Flood Protection] unsigned int ks_floodprotect_tick; // [Kill Steal Protection] unsigned int bloodylust_tick; // bloodylust player timer [out/in re full-heal protection] - + struct { short nameid; unsigned int tick; @@ -226,7 +226,7 @@ struct map_session_data { short disguise; // [Valaris] struct weapon_data right_weapon, left_weapon; - + // here start arrays to be globally zeroed at the beginning of status_calc_pc() int param_bonus[6],param_equip[6]; //Stores card/equipment bonuses. int subele[ELE_MAX]; @@ -350,7 +350,7 @@ struct map_session_data { struct script_regstr *regstr; int trade_partner; - struct { + struct { struct { short index, amount; } item[10]; @@ -464,7 +464,7 @@ struct map_session_data { unsigned short *id;/* array of combo ids */ unsigned char count; } combos; - + /** * Guarantees your friend request is legit (for bugreport:4629) **/ @@ -533,7 +533,7 @@ enum ammo_type { //Equip position constants enum equip_pos { - EQP_HEAD_LOW = 0x0001, + EQP_HEAD_LOW = 0x0001, EQP_HEAD_MID = 0x0200, //512 EQP_HEAD_TOP = 0x0100, //256 EQP_HAND_R = 0x0002, @@ -559,7 +559,7 @@ enum equip_pos { /// Equip positions that use a visible sprite #if PACKETVER < 20110111 #define EQP_VISIBLE EQP_HELM -#else +#else #define EQP_VISIBLE (EQP_HELM|EQP_GARMENT|EQP_COSTUME) #endif @@ -608,7 +608,7 @@ enum equip_index { #define pc_is50overweight(sd) ( (sd)->weight*100 >= (sd)->max_weight*battle_config.natural_heal_weight_rate ) #define pc_is90overweight(sd) ( (sd)->weight*10 >= (sd)->max_weight*9 ) #define pc_maxparameter(sd) ( ((((sd)->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO) || (sd)->class_&JOBL_THIRD ? ((sd)->class_&JOBL_BABY ? battle_config.max_baby_third_parameter : battle_config.max_third_parameter) : ((sd)->class_&JOBL_BABY ? battle_config.max_baby_parameter : battle_config.max_parameter)) ) -/** +/** * Ranger **/ #define pc_iswug(sd) ( (sd)->sc.option&OPTION_WUG ) @@ -649,7 +649,7 @@ enum equip_index { #define pc_leftside_atk(sd) ((sd)->battle_status.batk + (sd)->battle_status.rhw.atk + (sd)->battle_status.lhw.atk) #define pc_rightside_atk(sd) ((sd)->battle_status.rhw.atk2 + (sd)->battle_status.lhw.atk2) #define pc_leftside_def(sd) ((sd)->battle_status.def) - #define pc_rightside_def(sd) ((sd)->battle_status.def2) + #define pc_rightside_def(sd) ((sd)->battle_status.def2) #define pc_leftside_mdef(sd) ((sd)->battle_status.mdef) #define pc_rightside_mdef(sd) ( (sd)->battle_status.mdef2 - ((sd)->battle_status.vit>>1) ) #endif @@ -695,9 +695,9 @@ int pc_memo(struct map_session_data* sd, int pos); 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_payzeny(struct map_session_data*,int, enum e_log_pick_type type, struct map_session_data*); int pc_additem(struct map_session_data*,struct item*,int,e_log_pick_type); -int pc_getzeny(struct map_session_data*,int); +int pc_getzeny(struct map_session_data*,int, enum e_log_pick_type, struct map_session_data*); int pc_delitem(struct map_session_data*,int,int,int,short,e_log_pick_type); // Special Shop System |