summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-26 14:22:28 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-26 14:22:28 +0000
commitb6373365e5ac7ccf01c124fcebce6faba2d7519c (patch)
tree9f48c4b8dfa8c47d119961a55a8503ed9e3551e6 /src/map/mercenary.c
parent81d811f3c35d37e358f6874dd702923a0a934275 (diff)
downloadhercules-b6373365e5ac7ccf01c124fcebce6faba2d7519c.tar.gz
hercules-b6373365e5ac7ccf01c124fcebce6faba2d7519c.tar.bz2
hercules-b6373365e5ac7ccf01c124fcebce6faba2d7519c.tar.xz
hercules-b6373365e5ac7ccf01c124fcebce6faba2d7519c.zip
Replaced occurences of '-1' with the more appropriate 'INVALID_TIMER' value where appropriate.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12998 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 05dcfa4c7..6a027029f 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -496,7 +496,7 @@ static int merc_hom_hungry(int tid, unsigned int tick, int id, intptr data)
return 0;
}
- hd->hungry_timer = -1;
+ hd->hungry_timer = INVALID_TIMER;
hd->homunculus.hunger-- ;
if(hd->homunculus.hunger <= 10) {
@@ -525,7 +525,7 @@ int merc_hom_hungry_timer_delete(struct homun_data *hd)
nullpo_retr(0, hd);
if(hd->hungry_timer != -1) {
delete_timer(hd->hungry_timer,merc_hom_hungry);
- hd->hungry_timer = -1;
+ hd->hungry_timer = INVALID_TIMER;
}
return 1;
}
@@ -634,7 +634,7 @@ int merc_hom_alloc(struct map_session_data *sd, struct s_homunculus *hom)
map_addiddb(&hd->bl);
status_calc_homunculus(hd,1);
- hd->hungry_timer = -1;
+ hd->hungry_timer = INVALID_TIMER;
return 0;
}