diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-22 09:00:57 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-22 09:00:57 +0000 |
| commit | 5f857bae116433a2a0fd38b8c3539352c5453f7a (patch) | |
| tree | 52e60dcc8ba4ee1a7ddd2475eed6b63c977709b4 /src/map/mercenary.h | |
| parent | b5bbb9cc74ef82312be3f45b78634e238e4941c8 (diff) | |
| download | hercules-5f857bae116433a2a0fd38b8c3539352c5453f7a.tar.gz hercules-5f857bae116433a2a0fd38b8c3539352c5453f7a.tar.bz2 hercules-5f857bae116433a2a0fd38b8c3539352c5453f7a.tar.xz hercules-5f857bae116433a2a0fd38b8c3539352c5453f7a.zip | |
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
Diffstat (limited to 'src/map/mercenary.h')
| -rw-r--r-- | src/map/mercenary.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |