diff options
| author | sketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-14 06:29:35 +0000 |
|---|---|---|
| committer | sketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-14 06:29:35 +0000 |
| commit | 05ebaf88bbcf323ef1c3778a05af7fe565b6534c (patch) | |
| tree | 45ee5409cda42e43a87331407579c60fb8f00e24 | |
| parent | 1e0fdfa946da8bad031495ed3e72a7492bd8d17f (diff) | |
| download | hercules-05ebaf88bbcf323ef1c3778a05af7fe565b6534c.tar.gz hercules-05ebaf88bbcf323ef1c3778a05af7fe565b6534c.tar.bz2 hercules-05ebaf88bbcf323ef1c3778a05af7fe565b6534c.tar.xz hercules-05ebaf88bbcf323ef1c3778a05af7fe565b6534c.zip | |
* Corrected compiler warning and error made from r12959 and r12953, respectively. [SketchyPhoenix]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12954 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/pet.c | 1 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 1f4ddbed9..84a9c4395 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2008/07/14 * Made homunculi have doubled regen rates (they regen twice as fast) defined on battle configs. [Brainstorm] + * Corrected compiler warning and error made from r12959 and r12953, respectively. 2008/07/13 * Modified storage data loading (bugreport:1425) [ultramage] diff --git a/src/map/pet.c b/src/map/pet.c index 5ddeb88e5..2926e57a6 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -26,6 +26,7 @@ #include "skill.h" #include "unit.h" #include "atcommand.h" // msg_txt() +#include "log.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/map/status.c b/src/map/status.c index e7030fe3b..aacdf2fc8 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -7288,7 +7288,7 @@ static int status_natural_heal(struct block_list* bl, va_list args) regen->tick.sp += natural_heal_diff_tick*(regen->rate.sp+bonus); // Homun HP regen fix (they should regen as if they were sitting (twice as fast) - if(bl->type==BL_HOM) regen->tick.p *=2; + if(bl->type==BL_HOM) regen->tick.sp *=2; if(regen->tick.sp >= (unsigned int)battle_config.natural_healsp_interval) { |