diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/pc.c | 22 | ||||
| -rw-r--r-- | src/map/status.c | 17 |
2 files changed, 23 insertions, 16 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index bde2c5270..654d8836e 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1543,20 +1543,18 @@ int pc_bonus(struct map_session_data *sd,int type,int val) status->def_ele=val; break; case SP_MAXHP: - if(sd->state.lr_flag != 2) { - if (val < 0 && status->max_hp <= (unsigned int)(-val)) - status->max_hp = 1; - else - status->max_hp+=val; - } + if(sd->state.lr_flag == 2) + break; + val += (int)status->max_hp; + //Negative bonuses will underflow, this will be handled in status_calc_pc through casting + //If this is called outside of status_calc_pc, you'd better pray they do not underflow and end with UINT_MAX max_hp. + status->max_hp = (unsigned int)val; break; case SP_MAXSP: - if(sd->state.lr_flag != 2) { - if (val < 0 && status->max_sp <= (unsigned int)(-val)) - status->max_sp = 1; - else - status->max_sp+=val; - } + if(sd->state.lr_flag == 2) + break; + val += (int)status->max_sp; + status->max_sp = (unsigned int)val; break; case SP_CASTRATE: if(sd->state.lr_flag != 2) diff --git a/src/map/status.c b/src/map/status.c index fdcf1c2a3..b7e13f870 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1715,10 +1715,6 @@ int status_calc_pc(struct map_session_data* sd,int first) status->aspd_rate = 1000; status->ele_lv = 1; status->race = RC_DEMIHUMAN; - //Set base Max-Hp/Sp (required here for negative Hp/Sp bonuses to work properly) - //We hold the standard Max HP here to make it faster to recalculate on vit changes. - sd->status.max_hp = status->max_hp = status_base_pc_maxhp(sd,status); - sd->status.max_sp = status->max_sp = status_base_pc_maxsp(sd,status); //zero up structures... memset(&sd->autospell,0,sizeof(sd->autospell) @@ -2036,6 +2032,13 @@ int status_calc_pc(struct map_session_data* sd,int first) // ----- HP MAX CALCULATION ----- + // Basic MaxHP value + //We hold the standard Max HP here to make it faster to recalculate on vit changes. + sd->status.max_hp = status_base_pc_maxhp(sd,status); + //This is done to handle underflows from negative Max HP bonuses + i = sd->status.max_hp + (int)status->max_hp; + status->max_hp = cap_value(i, 0, INT_MAX); + // Absolute modifiers from passive skills if((skill=pc_checkskill(sd,CR_TRUST))>0) status->max_hp += skill*200; @@ -2055,6 +2058,12 @@ int status_calc_pc(struct map_session_data* sd,int first) // ----- SP MAX CALCULATION ----- + // Basic MaxSP value + sd->status.max_sp = status_base_pc_maxsp(sd,status); + //This is done to handle underflows from negative Max SP bonuses + i = sd->status.max_sp + (int)status->max_sp; + status->max_sp = cap_value(i, 0, INT_MAX); + // Absolute modifiers from passive skills if((skill=pc_checkskill(sd,SL_KAINA))>0) status->max_sp += 30*skill; |