diff options
| author | csnv <ctt@csnv.es> | 2015-01-11 01:47:46 +0100 |
|---|---|---|
| committer | csnv <ctt@csnv.es> | 2015-01-11 01:47:46 +0100 |
| commit | d51196ba94491780a7d70c07db119812b20a5f23 (patch) | |
| tree | 7b756d867f43edb63e0a0888a885303206aea373 /src | |
| parent | 4e8837d4e53d72bb83eea25285403dabcc129442 (diff) | |
| download | hercules-d51196ba94491780a7d70c07db119812b20a5f23.tar.gz hercules-d51196ba94491780a7d70c07db119812b20a5f23.tar.bz2 hercules-d51196ba94491780a7d70c07db119812b20a5f23.tar.xz hercules-d51196ba94491780a7d70c07db119812b20a5f23.zip | |
Corrected comments and INF2_NOLP
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/skill.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index ac208a204..cd46be0fa 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -15319,7 +15319,9 @@ int skill_cell_overlap(struct block_list *bl, va_list ap) { skill->delunit(su); return 1; } - if( !(skill->get_inf2(su->group->skill_id)&(INF2_SONG_DANCE|INF2_TRAP)) || su->group->skill_id == WZ_FIREPILLAR || su->group->skill_id == GN_HELLS_PLANT) { //It deletes everything except songs/dances and traps + // SA_LANDPROTECTOR blocks everything except songs/dances/traps (and NOLP) + // TODO: Do these skills ignore land protector when placed on top? + if( !(skill->get_inf2(su->group->skill_id)&(INF2_SONG_DANCE|INF2_TRAP|INF2_NOLP)) || su->group->skill_id == WZ_FIREPILLAR || su->group->skill_id == GN_HELLS_PLANT) { skill->delunit(su); return 1; } @@ -15377,7 +15379,7 @@ int skill_cell_overlap(struct block_list *bl, va_list ap) { } if (su->group->skill_id == SA_LANDPROTECTOR && !(skill->get_inf2(skill_id)&(INF2_SONG_DANCE|INF2_TRAP|INF2_NOLP))) { - //It deletes everything except songs/dances/traps + //SA_LANDPROTECTOR blocks everything except songs/dances/traps (and NOLP) (*alive) = 0; return 1; } |