From 847a41f41dc4296c8c2aa42a79c23336f55e665b Mon Sep 17 00:00:00 2001 From: euphyy Date: Thu, 27 Dec 2012 06:11:18 +0000 Subject: > Follow-up r17048: - Renamed 'useskilltopc' to 'npcskill'; - Removed cast time from NPC objects, code by mkbu95 (suspected official behavior); - Documented 'npcskill'; - Replaced all instances in scripts. * Fixed max level bypass, code by malufett (bugreport:5800). * Updated Malangdo spawns to official. * Some standardization of npc/quests/first_class/. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17049 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/unit.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 07b728f47..e1e9d9690 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1276,6 +1276,10 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh casttime = skill_vfcastfix(src, casttime, skill_num, skill_lv); #endif + if (src->type == BL_NPC) { // NPC-objects do not have cast time + casttime = 0; + } + if(!ud->state.running) //need TK_RUN or WUGDASH handler to be done before that, see bugreport:6026 unit_stop_walking(src,1);// eventhough this is not how official works but this will do the trick. bugreport:6829 // in official this is triggered even if no cast time. @@ -1439,6 +1443,9 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, sh casttime = skill_vfcastfix(src, casttime, skill_num, skill_lv ); #endif + if (src->type == BL_NPC) { // NPC-objects do not have cast time + casttime = 0; + } ud->state.skillcastcancel = castcancel&&casttime>0?1:0; if( !sd || sd->skillitem != skill_num || skill_get_cast(skill_num,skill_lv) ) -- cgit v1.2.3-70-g09d2