From 5f857bae116433a2a0fd38b8c3539352c5453f7a Mon Sep 17 00:00:00 2001 From: ultramage Date: Sat, 22 Dec 2007 09:00:57 +0000 Subject: Fixed mob AI code iterating over non-mob objects without checking, when monster_ai flag 0x20 is set (caused by r11943) Cleaned up macros that wrap unit_stop_attack() (bugreport:357) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11957 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/mercenary.h') diff --git a/src/map/mercenary.h b/src/map/mercenary.h index ba5db0ba8..95193df0a 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -55,7 +55,7 @@ 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) 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; } +#define merc_stop_attack(hd) unit_stop_attack(&(hd)->bl) int merc_hom_increase_intimacy(struct homun_data * hd, unsigned int value); int merc_hom_decrease_intimacy(struct homun_data * hd, unsigned int value); int merc_skill_tree_get_max(int id, int b_class); -- cgit v1.2.3-60-g2f50