summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 20:28:59 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 20:28:59 +0000
commita312b3eeb8faaa7d60e9fc515bab9e79af138b3c (patch)
tree7d6d4446cd1d8dd0b8613a659d327c290b602240 /src
parenta32695754b07306975ac17df4df35277b6862c2a (diff)
downloadhercules-a312b3eeb8faaa7d60e9fc515bab9e79af138b3c.tar.gz
hercules-a312b3eeb8faaa7d60e9fc515bab9e79af138b3c.tar.bz2
hercules-a312b3eeb8faaa7d60e9fc515bab9e79af138b3c.tar.xz
hercules-a312b3eeb8faaa7d60e9fc515bab9e79af138b3c.zip
- Some cleaning in the order of cases in castend damage id.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7953 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 78b142d8b..e03e87d22 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2700,6 +2700,16 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
case HT_POWER:
case TK_DOWNKICK:
case TK_COUNTER:
+ case GS_TRIPLEACTION:
+ case GS_MAGICALBULLET:
+ case GS_CRACKER:
+ case GS_TRACKING:
+ case GS_PIERCINGSHOT:
+ case GS_RAPIDSHOWER:
+ case GS_DUST:
+ case GS_FULLBUSTER:
+ case NJ_SYURIKEN:
+ case NJ_KUNAI:
case ASC_BREAKER:
case HFLI_MOON: //[orn]
case HFLI_SBR44: //[orn]
@@ -3147,19 +3157,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
}
break;
- //Until they're at right position - gs_damage- [Vicious]
- case GS_TRIPLEACTION:
- case GS_MAGICALBULLET:
- case GS_CRACKER:
- case GS_TRACKING:
- case GS_PIERCINGSHOT:
- case GS_RAPIDSHOWER:
- case GS_DUST:
- case GS_FULLBUSTER:
- case NJ_SYURIKEN:
- case NJ_KUNAI:
- skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
- break;
case GS_BULLSEYE:
if(tstatus->race == RC_BRUTE || tstatus->race == RC_DEMIHUMAN)
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);