Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed aciddemo map server crash

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12454 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lupus 2008-03-31 10:54:12 +00:00
parent 0beb670305
commit 8cf1f0ddf1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/03/31
* Fixed ACIDDEMO crash, thanks to Kaato&Konard [Lupus]
2008/03/30 2008/03/30
* yet more login server stuff * yet more login server stuff
- jA data structure compatibility renaming / adjustments - jA data structure compatibility renaming / adjustments

3
src/map/battle.c
View File

@ -2518,7 +2518,10 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
md.damage = 1+rand()%9999; md.damage = 1+rand()%9999;
break; break;
case CR_ACIDDEMONSTRATION: // updated the formula based on a Japanese formula found to be exact [Reddozen] case CR_ACIDDEMONSTRATION: // updated the formula based on a Japanese formula found to be exact [Reddozen]
if(tstatus->vit+sstatus->int_) //crash fix
md.damage = 7*tstatus->vit*sstatus->int_*sstatus->int_ / (10*(tstatus->vit+sstatus->int_)); md.damage = 7*tstatus->vit*sstatus->int_*sstatus->int_ / (10*(tstatus->vit+sstatus->int_));
else
md.damage = 0;
if (tsd) md.damage>>=1; if (tsd) md.damage>>=1;
if (md.damage < 0 || md.damage > INT_MAX>>1) if (md.damage < 0 || md.damage > INT_MAX>>1)
//Overflow prevention, will anyone whine if I cap it to a few billion? //Overflow prevention, will anyone whine if I cap it to a few billion?