summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-20 00:08:46 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-20 00:08:46 +0000
commit28568dcb403cb7d1369b4bb2a4242a108794dbf9 (patch)
tree0c30dd043bfc9a136d6bca8ee7b53041c7ea5aea /src/map/clif.c
parent526535c336409064e85aaf725a06239285d5399a (diff)
downloadhercules-28568dcb403cb7d1369b4bb2a4242a108794dbf9.tar.gz
hercules-28568dcb403cb7d1369b4bb2a4242a108794dbf9.tar.bz2
hercules-28568dcb403cb7d1369b4bb2a4242a108794dbf9.tar.xz
hercules-28568dcb403cb7d1369b4bb2a4242a108794dbf9.zip
- Added back the "you can't walk delay while attacking" to unit_attack_timer, now when you want to walk during your attack animation, you will only stop attacking, you will have to click again to move.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6185 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 432329745..484abb02a 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8158,17 +8158,16 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd) {
if (clif_cant_act(sd) && sd->sc.opt1 != OPT1_STONEWAIT)
return;
- if (!unit_can_move(&sd->bl))
+ if(sd->sc.count && sd->sc.data[SC_RUN].timer != -1)
return;
- if(sd->sc.count && sd->sc.data[SC_RUN].timer != -1)
+ pc_stop_attack(sd);
+ if (!unit_can_move(&sd->bl))
return;
if (sd->invincible_timer != -1)
pc_delinvincibletimer(sd);
- pc_stop_attack(sd);
-
cmd = RFIFOW(fd,0);
x = RFIFOB(fd,packet_db[sd->packet_ver][cmd].pos[0]) * 4 +
(RFIFOB(fd,packet_db[sd->packet_ver][cmd].pos[0] + 1) >> 6);