diff options
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/status.c | 17 |
2 files changed, 17 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 45760a47f..fc5962ac1 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,10 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/07
+ * status_calc_pc now assumes that if your max hp is negative, it has
+ overflowed, and as such, it is set to the max_hp setting instead of 1. This
+ 'dangerous' assumptio is alright as long as there aren't equipment that can
+ send your hp to negative values. [Skotlex]
- Fixed the soul linker skill tree. (Thanks to muad_dib) [Zephiris]
* Added Gunslinger and Ninja into @job. of course, you need latest EXE
for make this work... and of course no skills yet! [Vicious]
diff --git a/src/map/status.c b/src/map/status.c index 3e0c844f5..23a4db4a8 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -7,6 +7,7 @@ #include <stdlib.h>
#include <memory.h>
#include <string.h>
+#include <limits.h>
#include "pc.h"
#include "map.h"
@@ -1374,11 +1375,14 @@ int status_calc_pc(struct map_session_data* sd,int first) sd->status.max_hp = sd->status.max_hp * sd->hprate/100;
if(battle_config.hp_rate != 100)
sd->status.max_hp = sd->status.max_hp * battle_config.hp_rate/100;
-
- if(sd->status.max_hp > battle_config.max_hp)
+
+ if (sd->status.max_hp < 0) //HP overflow??
+ sd->status.max_hp = battle_config.max_hp;
+ else if(sd->status.max_hp > battle_config.max_hp)
sd->status.max_hp = battle_config.max_hp;
- else if(sd->status.max_hp <= 0)
+ else if(sd->status.max_hp == 0)
sd->status.max_hp = 1;
+
if(sd->status.hp>sd->status.max_hp)
sd->status.hp=sd->status.max_hp;
@@ -5623,7 +5627,8 @@ int status_change_clear_debuffs (struct block_list *bl) static int status_calc_sigma(void)
{
- int i,j,k;
+ int i,j;
+ unsigned int k;
for(i=0;i<MAX_PC_CLASS;i++) {
memset(hp_sigma_val[i],0,sizeof(hp_sigma_val[i]));
@@ -5631,7 +5636,11 @@ static int status_calc_sigma(void) k += hp_coefficient[i]*j + 50;
k -= k%100;
hp_sigma_val[i][j-1] = k;
+ if (k >= INT_MAX)
+ break; //Overflow protection. [Skotlex]
}
+ for(;j<=MAX_LEVEL;j++)
+ hp_sigma_val[i][j-1] = INT_MAX;
}
return 0;
}
|