diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-09-09 17:33:10 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-09-09 17:33:10 +0000 |
| commit | e02e0c5cba6e83986da6fdce9c69a9201f9a271f (patch) | |
| tree | 2cefad3c969bea2a2c5d25e3c220eafc2451301a /src/map/battle.c | |
| parent | 45e089c554e673f7dc017c45bdfa68663713cda9 (diff) | |
| download | hercules-e02e0c5cba6e83986da6fdce9c69a9201f9a271f.tar.gz hercules-e02e0c5cba6e83986da6fdce9c69a9201f9a271f.tar.bz2 hercules-e02e0c5cba6e83986da6fdce9c69a9201f9a271f.tar.xz hercules-e02e0c5cba6e83986da6fdce9c69a9201f9a271f.zip | |
Enabled WoE SE to be run independently of WoE. Let's see how long it is before something blows up, or Ultramage pulls out his hair while cursing my existence.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13202 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 1140c6640..8dc6eb394 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3150,7 +3150,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f { struct mob_data *md = BL_CAST(BL_MOB, t_bl); - if( !(agit_flag && map[m].flag.gvg_castle) && md->guardian_data && md->guardian_data->guild_id ) + if( !((agit_flag || agit2_flag) && map[m].flag.gvg_castle) && md->guardian_data && md->guardian_data->guild_id ) return 0; // Disable guardians/emperiums owned by Guilds on non-woe times. break; } @@ -3213,7 +3213,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f case BL_MOB: { struct mob_data *md = BL_CAST(BL_MOB, s_bl); - if( !(agit_flag && map[m].flag.gvg_castle) && md->guardian_data && md->guardian_data->guild_id ) + if( !((agit_flag || agit2_flag) && map[m].flag.gvg_castle) && md->guardian_data && md->guardian_data->guild_id ) return 0; // Disable guardians/emperium owned by Guilds on non-woe times. if( !md->special_state.ai ) |