summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-25 19:07:48 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-25 19:07:48 +0000
commitb82fbb92d45afeb9e0f89cb5d7e632c51604ca52 (patch)
tree7adbec0477298e0e38893ccfa8110c81848eb877 /src/map/skill.c
parent3d504020707e78e2fbb503abcb3d479f28151a8c (diff)
downloadhercules-b82fbb92d45afeb9e0f89cb5d7e632c51604ca52.tar.gz
hercules-b82fbb92d45afeb9e0f89cb5d7e632c51604ca52.tar.bz2
hercules-b82fbb92d45afeb9e0f89cb5d7e632c51604ca52.tar.xz
hercules-b82fbb92d45afeb9e0f89cb5d7e632c51604ca52.zip
- Corrected High Jump so it works on Guild Castles when WoE is off.
- Moonlit petals now always knocks to the back of the character rather than pushing the character away from it's center. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10355 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index b3a5d432b..813018852 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1775,7 +1775,7 @@ int skill_blown (struct block_list *src, struct block_list *target, int count)
if (src != target && map_flag_gvg(target->m))
return 0; //No knocking back in WoE
- if (!count&0xffff)
+ if (!(count&0xffff))
return 0; //Actual knockback distance is 0.
switch (target->type) {
@@ -4743,7 +4743,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
int x,y, dir = unit_getdir(src);
//Fails on noteleport maps, except for vs maps [Skotlex]
- if(map[src->m].flag.noteleport && !map_flag_vs(src->m)) {
+ if(map[src->m].flag.noteleport &&
+ !(map_flag_vs(src->m) || map_flag_gvg2(src->m))
+ ) {
x = src->x;
y = src->y;
} else {
@@ -7096,7 +7098,7 @@ int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, unsigned
break;
if (ss == bl) //Also needed to prevent infinite loop crash.
break;
- skill_blown(ss, bl, skill_get_blewcount(sg->skill_id,sg->skill_lv));
+ skill_blown(ss, bl, 0x10000|skill_get_blewcount(sg->skill_id,sg->skill_lv));
break;
}
return skillid;