diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-27 15:07:55 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-27 15:07:55 +0000 |
| commit | 344be8d138d359fd0be0ee72820a7982a9a8d39f (patch) | |
| tree | 28b8a495326928bdd81c03fbb29f3863c21c3ae7 /src/map/skill.c | |
| parent | d5daeaf65b0892f5fd6dfc8cce13cc131d434b80 (diff) | |
| download | hercules-344be8d138d359fd0be0ee72820a7982a9a8d39f.tar.gz hercules-344be8d138d359fd0be0ee72820a7982a9a8d39f.tar.bz2 hercules-344be8d138d359fd0be0ee72820a7982a9a8d39f.tar.xz hercules-344be8d138d359fd0be0ee72820a7982a9a8d39f.zip | |
- Merged some splash changes from stable. Sharp-Shooting will now display a skill animation.
- The no_spawn_on_player setting will now also work for static mobs, but only if the setting is set to 100 or higher.
- Some small cleanups.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8887 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index f1ff94fcd..b5c01bf1d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2031,13 +2031,12 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds case NPC_SPLASHATTACK: case TF_DOUBLE: case GS_CHAINACTION: - case SN_SHARPSHOOTING: dmg.dmotion = clif_damage(src,bl,tick,dmg.amotion,dmg.dmotion,damage,dmg.div_,dmg.type,dmg.damage2); break; default: //Disabling skill animation doesn't works on multi-hit. dmg.dmotion = clif_skill_damage(dsrc,bl,tick, dmg.amotion, dmg.dmotion, - damage, dmg.div_, skillid, flag&SD_LEVEL?-1:skilllv, + damage, dmg.div_, skillid, flag&SD_LEVEL?-1:skilllv, (flag&SD_ANIMATION && dmg.div_ < 2?5:type)); break; } @@ -4038,8 +4037,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case NJ_HYOUSYOURAKU: case NJ_RAIGEKISAI: - clif_skill_nodamage(src,bl,skillid,skilllv,1); case WZ_FROSTNOVA: + clif_skill_nodamage(src,bl,skillid,skilllv,1); skill_area_temp[1] = 0; map_foreachinrange(skill_attack_area, src, skill_get_splash(skillid, skilllv), BL_CHAR, |