diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-16 19:16:16 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-16 19:16:16 +0000 |
commit | 7d9a2511382e90bc468602fec78f1f473cacf637 (patch) | |
tree | 0dde3dcd80011f034343bd00971e464d7fe6e023 /src | |
parent | fb635209b4dff794db3f3df8fdb62478c797b882 (diff) | |
download | hercules-7d9a2511382e90bc468602fec78f1f473cacf637.tar.gz hercules-7d9a2511382e90bc468602fec78f1f473cacf637.tar.bz2 hercules-7d9a2511382e90bc468602fec78f1f473cacf637.tar.xz hercules-7d9a2511382e90bc468602fec78f1f473cacf637.zip |
- Emergency call &16 (disable skill from nowarpto maps) will now NOT block Emergency Call if that map is also a gvg-castle map. Makes it safe to turn on this option to prevent usage from special maps (like Lhz3) without crippling the skill during WoE.
- Added &16 to the default of the emergency_call setting.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9000 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r-- | src/map/skill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 5e1a87606..6a4993ec8 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -907,7 +907,7 @@ int skillnotok (int skillid, struct map_session_data *sd) !(battle_config.emergency_call&(agit_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) + (battle_config.emergency_call&16 && map[m].flag.nowarpto && !map[m].flag.gvg_castle) ) { clif_skill_fail(sd,skillid,0,0); return 1; |