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/skill.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/skill.c')
| -rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 2b242821d..1a8cdf0a1 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -340,7 +340,7 @@ int skillnotok (int skillid, struct map_session_data *sd) return 1; if(map_flag_gvg(m) && skill_get_nocast (skillid) & 4) return 1; - if(agit_flag && skill_get_nocast (skillid) & 8) + if((agit_flag || agit2_flag) && skill_get_nocast (skillid) & 8) return 1; if(map[m].flag.restricted && map[m].zone && skill_get_nocast (skillid) & (8*map[m].zone)) return 1; @@ -379,7 +379,7 @@ int skillnotok (int skillid, struct map_session_data *sd) break; case GD_EMERGENCYCALL: if ( - !(battle_config.emergency_call&(agit_flag?2:1)) || + !(battle_config.emergency_call&((agit_flag || agit2_flag)?2:1)) || !(battle_config.emergency_call&(map[m].flag.gvg || map[m].flag.gvg_castle?8:4)) || (battle_config.emergency_call&16 && map[m].flag.nowarpto && !map[m].flag.gvg_castle) ) { |