summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-06 18:28:03 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-06 18:28:03 +0000
commitf52effe3297697259c889f6c0d35e58282553348 (patch)
treec6b898f572cbbb5c5f6c5962a8b6fd264860c05a /src/map/skill.c
parent537b169ac3999fa1b006af075d7a0ae13e28ec56 (diff)
downloadhercules-f52effe3297697259c889f6c0d35e58282553348.tar.gz
hercules-f52effe3297697259c889f6c0d35e58282553348.tar.bz2
hercules-f52effe3297697259c889f6c0d35e58282553348.tar.xz
hercules-f52effe3297697259c889f6c0d35e58282553348.zip
- Removed gm_all_skill_add_abra which was doing nothing anyway.
- Updated Land Protector to block absolutely every land-based skills with the exception of Encores/Dances. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8948 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 98a4e2dc8..8802a3678 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -9288,7 +9288,9 @@ int skill_landprotector (struct block_list *bl, va_list ap)
}
//Delete the rest of types.
case HW_GANBANTEIN:
- if(skill_get_type(unit->group->skill_id) == BF_MAGIC)
+ //Update: It deletes everything except songs/dances/encores.
+ if(!unit->group->state.song_dance)
+// if(skill_get_type(unit->group->skill_id) == BF_MAGIC)
{ //Delete Magical effects
skill_delunit(unit, 1);
return 1;
@@ -9319,7 +9321,9 @@ int skill_landprotector (struct block_list *bl, va_list ap)
break;
}
if (unit->group->skill_id == SA_LANDPROTECTOR &&
- skill_get_type(skillid) == BF_MAGIC)
+ //Update: It deletes everything except songs/dances/encores.
+ !(skill_get_inf2(skillid)&(UF_DANCE|UF_SONG|UF_ENSEMBLE)))
+// skill_get_type(skillid) == BF_MAGIC)
{ //Magic tile won't be activated
(*alive) = 0;
return 1;