summaryrefslogtreecommitdiff
path: root/src/map/mercenary.h
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-03 12:35:34 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-03 12:35:34 +0000
commitcf9b4b50d677a0846c6213acb6bd58fc6ff0d0bb (patch)
treeeeded5380a9eed5e1885b8db9b88ca53e3087a9c /src/map/mercenary.h
parent92a6b6e9e2593b65e3337dcc45347f22b825a2ed (diff)
downloadhercules-cf9b4b50d677a0846c6213acb6bd58fc6ff0d0bb.tar.gz
hercules-cf9b4b50d677a0846c6213acb6bd58fc6ff0d0bb.tar.bz2
hercules-cf9b4b50d677a0846c6213acb6bd58fc6ff0d0bb.tar.xz
hercules-cf9b4b50d677a0846c6213acb6bd58fc6ff0d0bb.zip
Tried to make sense out of timer.c ... and failed
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11647 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.h')
-rw-r--r--src/map/mercenary.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 06378d8f9..ba5db0ba8 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -54,7 +54,7 @@ int merc_hom_food(struct map_session_data *sd, struct homun_data *hd);
int merc_hom_hungry_timer_delete(struct homun_data *hd);
int merc_hom_change_name(struct map_session_data *sd,char *name);
int merc_hom_change_name_ack(struct map_session_data *sd, char* name, int flag);
-#define merc_stop_walking(hd, type) { if((hd)->ud.walktimer != -1) unit_stop_walking(&(hd)->bl, type); }
+#define merc_stop_walking(hd, type) unit_stop_walking(&(hd)->bl, type)
#define merc_stop_attack(hd) { if((hd)->ud.attacktimer != -1) unit_stop_attack(&(hd)->bl); hd->ud.target = 0; }
int merc_hom_increase_intimacy(struct homun_data * hd, unsigned int value);
int merc_hom_decrease_intimacy(struct homun_data * hd, unsigned int value);