diff options
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 67 |
1 files changed, 16 insertions, 51 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 91f7750b3..ebf474823 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -683,49 +683,21 @@ enum equip_pos { #define pc_has_permission(sd, permission) ( ((sd)->permissions&permission) != 0 ) #define pc_should_log_commands(sd) ( (sd)->group_log_command != false ) - - - - #define pc_checkoverhp(sd) ((sd)->battle_status.hp == (sd)->battle_status.max_hp) #define pc_checkoversp(sd) ((sd)->battle_status.sp == (sd)->battle_status.max_sp) - - - - - - - - - - - - - - - - - -#define pc_readglobalreg(sd,reg) iPc->readregistry(sd,reg,3) -#define pc_setglobalreg(sd,reg,val) iPc->setregistry(sd,reg,val,3) -#define pc_readglobalreg_str(sd,reg) iPc->readregistry_str(sd,reg,3) -#define pc_setglobalreg_str(sd,reg,val) iPc->setregistry_str(sd,reg,val,3) -#define pc_readaccountreg(sd,reg) iPc->readregistry(sd,reg,2) -#define pc_setaccountreg(sd,reg,val) iPc->setregistry(sd,reg,val,2) -#define pc_readaccountregstr(sd,reg) iPc->readregistry_str(sd,reg,2) -#define pc_setaccountregstr(sd,reg,val) iPc->setregistry_str(sd,reg,val,2) -#define pc_readaccountreg2(sd,reg) iPc->readregistry(sd,reg,1) -#define pc_setaccountreg2(sd,reg,val) iPc->setregistry(sd,reg,val,1) -#define pc_readaccountreg2str(sd,reg) iPc->readregistry_str(sd,reg,1) -#define pc_setaccountreg2str(sd,reg,val) iPc->setregistry_str(sd,reg,val,1) - - - - - - - +#define pc_readglobalreg(sd,reg) pc->readregistry(sd,reg,3) +#define pc_setglobalreg(sd,reg,val) pc->setregistry(sd,reg,val,3) +#define pc_readglobalreg_str(sd,reg) pc->readregistry_str(sd,reg,3) +#define pc_setglobalreg_str(sd,reg,val) pc->setregistry_str(sd,reg,val,3) +#define pc_readaccountreg(sd,reg) pc->readregistry(sd,reg,2) +#define pc_setaccountreg(sd,reg,val) pc->setregistry(sd,reg,val,2) +#define pc_readaccountregstr(sd,reg) pc->readregistry_str(sd,reg,2) +#define pc_setaccountregstr(sd,reg,val) pc->setregistry_str(sd,reg,val,2) +#define pc_readaccountreg2(sd,reg) pc->readregistry(sd,reg,1) +#define pc_setaccountreg2(sd,reg,val) pc->setregistry(sd,reg,val,1) +#define pc_readaccountreg2str(sd,reg) pc->readregistry_str(sd,reg,1) +#define pc_setaccountreg2str(sd,reg,val) pc->setregistry_str(sd,reg,val,1) struct skill_tree_entry { short id; @@ -758,15 +730,6 @@ extern struct fame_list taekwon_fame_list[MAX_FAME_LIST]; enum {ADDITEM_EXIST,ADDITEM_NEW,ADDITEM_OVERAMOUNT}; - - - - - - - - - #if defined(RENEWAL_DROP) || defined(RENEWAL_EXP) #endif /*===================================== @@ -981,10 +944,12 @@ struct pc_interface { int (*del_talisman) (struct map_session_data *sd,int count,int type); void (*baselevelchanged) (struct map_session_data *sd); +#if defined(RENEWAL_DROP) || defined(RENEWAL_EXP) int (*level_penalty_mod) (struct map_session_data *sd, struct mob_data * md, int type); -} iPc_s; +#endif +} pc_s; -struct pc_interface *iPc; +struct pc_interface *pc; void pc_defaults(void); |