Parcourir la source

Last commit
Fixed homun sp regen bug introduced on r12953 bugreport:2071

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13130 54d463be-8e91-2dee-dedb-b68131a5f0ec

shadow il y a 16 ans
Parent
commit
b75838a07b
2 fichiers modifiés avec 8 ajouts et 6 suppressions
  1. 1 0
      Changelog-Trunk.txt
  2. 7 6
      src/map/status.c

+ 1 - 0
Changelog-Trunk.txt

@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2008/08/25
+	* Fixed homun sp regen bug introduced on r12953 bugreport:2071 [Brain]
 	* Fixed: several compiler warnings [akrus]
 2008/08/20
 	* Rev. 13098 Implemented Brainstorm's and SketchyPhoenix's fixes for Flying side kick. [L0ne_W0lf]

+ 7 - 6
src/map/status.c

@@ -7367,10 +7367,10 @@ static int status_natural_heal(struct block_list* bl, va_list args)
 		rate = natural_heal_diff_tick*(regen->rate.hp+bonus);
 		if (ud && ud->walktimer != -1)
 			rate/=2;
-		regen->tick.hp += rate;
+		// Homun HP regen fix (they should regen as if they were sitting (twice as fast) 
+		if(bl->type==BL_HOM) rate *=2;
 
-		// Homun HP regen fix (they should regen as if they were sitting (twice as fast)
-		if(bl->type==BL_HOM) regen->tick.hp *=2;
+		regen->tick.hp += rate;
 		
 		if(regen->tick.hp >= (unsigned int)battle_config.natural_healhp_interval)
 		{
@@ -7387,10 +7387,11 @@ static int status_natural_heal(struct block_list* bl, va_list args)
 	//Natural SP regen
 	if(flag&RGN_SP)
 	{
-		regen->tick.sp += natural_heal_diff_tick*(regen->rate.sp+bonus);
+		rate = natural_heal_diff_tick*(regen->rate.sp+bonus)
+		// Homun SP regen fix (they should regen as if they were sitting (twice as fast) 
+		if(bl->type==BL_HOM) rate *=2;
 
-		// Homun HP regen fix (they should regen as if they were sitting (twice as fast)
-		if(bl->type==BL_HOM) regen->tick.sp *=2;
+		regen->tick.sp += rate;
 		
 		if(regen->tick.sp >= (unsigned int)battle_config.natural_healsp_interval)
 		{