- Reverted the position of the max_hp/max_sp basic setting, modified the max_hp/max_sp bonuses to use casting in order to work correctly with negative bonuses.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11832 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 13 insertions, 4 deletions

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;