diff options
| author | shadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-25 09:55:22 +0000 |
|---|---|---|
| committer | shadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-25 09:55:22 +0000 |
| commit | 46de3e9e9eed331d432c30862bfda250f81f25eb (patch) | |
| tree | df7e309a0c45591bfa47087d01144256039af930 | |
| parent | 99eb3303435c4b02cbc1f76c0f836763481d23b4 (diff) | |
| download | hercules-46de3e9e9eed331d432c30862bfda250f81f25eb.tar.gz hercules-46de3e9e9eed331d432c30862bfda250f81f25eb.tar.bz2 hercules-46de3e9e9eed331d432c30862bfda250f81f25eb.tar.xz hercules-46de3e9e9eed331d432c30862bfda250f81f25eb.zip | |
Last commit
Fixed homun sp regen bug introduced on r12953 bugreport:2071
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13130 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/status.c | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7c4fad66c..c7582ab20 100644 --- a/Changelog-Trunk.txt +++ b/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] diff --git a/src/map/status.c b/src/map/status.c index ef7527fe5..d437aea01 100644 --- a/src/map/status.c +++ b/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) { |