From ed87621c65d7c13ddd4993101a5b7c2287b6609e Mon Sep 17 00:00:00 2001 From: ultramage Date: Wed, 12 Dec 2007 09:55:13 +0000 Subject: * Some preparations for the guild script update - cleaned up npc event execution code - cleaned up guild data loading/saving code; to be improved later - removed dummy 'account name' expulsion list management code - removed columns 'rsv1' and 'rsv2' from guild member data - removed columns 'rsv1' 'rsv2' 'rsv3' and 'acc' from guild expulsion data - added upgrade_svn11895.sql for SQL git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11895 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index 346948cb6..eeb368feb 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3232,7 +3232,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f int t_guild = status_get_guild_id(t_bl); if ( !(map[m].flag.pvp && map[m].flag.pvp_noguild) && - s_guild && t_guild && (s_guild == t_guild || guild_idisallied(s_guild, t_guild)) + s_guild && t_guild && (s_guild == t_guild || guild_isallied(s_guild, t_guild)) ) state |= BCT_GUILD; else @@ -3260,7 +3260,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f if (flag&BCT_GUILD || state&BCT_ENEMY) { int s_guild = status_get_guild_id(s_bl); int t_guild = status_get_guild_id(t_bl); - if(s_guild && t_guild && (s_guild == t_guild || guild_idisallied(s_guild, t_guild))) + if(s_guild && t_guild && (s_guild == t_guild || guild_isallied(s_guild, t_guild))) state |= BCT_GUILD; } } -- cgit v1.2.3-70-g09d2