summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-28 03:07:59 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-28 03:07:59 +0000
commitd84f1081d81ceaafe1f4de1e8839ccce656dfdc2 (patch)
tree05b119aad01ba054c15a01a73cf81aa50875e83a
parentfd5a6f34813f11dde4d46a7cfa6402ab681f9d28 (diff)
downloadhercules-d84f1081d81ceaafe1f4de1e8839ccce656dfdc2.tar.gz
hercules-d84f1081d81ceaafe1f4de1e8839ccce656dfdc2.tar.bz2
hercules-d84f1081d81ceaafe1f4de1e8839ccce656dfdc2.tar.xz
hercules-d84f1081d81ceaafe1f4de1e8839ccce656dfdc2.zip
- skill_castend_id and skill_castend_pos will trigger unit_stop_walking with flag 1 (fix pos) rather than none. Should fix some skills making you appear moving while doing them.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6336 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/skill.c4
-rw-r--r--src/map/unit.c5
3 files changed, 5 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 9197143bc..1ddb18a3b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/27
+ * skill_castend_id and skill_castend_pos will trigger unit_stop_walking
+ with flag 1 (fix pos) rather than none. Should fix some skills making you
+ appear moving while doing them. [Skotlex]
* Modified clif_skill_nodamage to allow for a NULL source. This is to
simplify code related to AL_HEAL/MG_RECOVERY effects where someone shows a
healing value, but there's no "caster" in sight (Pitcher skills, Blood
diff --git a/src/map/skill.c b/src/map/skill.c
index 578b634b5..d1b25b791 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5674,7 +5674,7 @@ int skill_castend_id( int tid, unsigned int tick, int id,int data )
break;
if (ud->walktimer != -1 && ud->skillid != TK_RUN)
- unit_stop_walking(src,0);
+ unit_stop_walking(src,1);
if (ud->skillid == SA_MAGICROD)
ud->canact_tick = tick;
@@ -5787,7 +5787,7 @@ int skill_castend_pos( int tid, unsigned int tick, int id,int data )
if(battle_config.skill_log && battle_config.skill_log&src->type)
ShowInfo("Type %d, ID %d skill castend pos [id =%d, lv=%d, (%d,%d)]\n",
src->type, src->id, ud->skillid, ud->skilllv, ud->skillx, ud->skilly);
- unit_stop_walking(src,0);
+ unit_stop_walking(src,1);
ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv);
unit_set_walkdelay(src, tick, skill_get_walkdelay(ud->skillid, ud->skilllv), 1);
skill_castend_pos2(src,ud->skillx,ud->skilly,ud->skillid,ud->skilllv,tick,0);
diff --git a/src/map/unit.c b/src/map/unit.c
index 1ba8fd92f..84d964fe9 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -680,11 +680,6 @@ int unit_set_walkdelay(struct block_list *bl, unsigned int tick, int delay, int
return 1;
}
-/*==========================================
- * Applies walk delay based on attack type. [Skotlex]
- *------------------------------------------
- */
-
int unit_skilluse_id2(struct block_list *src, int target_id, int skill_num, int skill_lv, int casttime, int castcancel) {
struct unit_data *ud;
struct status_change *sc;