summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-05 08:45:39 +0000
committerKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-05 08:45:39 +0000
commitae34b88fc662651d0f42db5338dfa77f4ed97b82 (patch)
tree62c57113a9d3a8dcd4a0eed283534ef4f5cbf015
parent415d67279afe894590a58a44d647af2576e5cc10 (diff)
downloadhercules-ae34b88fc662651d0f42db5338dfa77f4ed97b82.tar.gz
hercules-ae34b88fc662651d0f42db5338dfa77f4ed97b82.tar.bz2
hercules-ae34b88fc662651d0f42db5338dfa77f4ed97b82.tar.xz
hercules-ae34b88fc662651d0f42db5338dfa77f4ed97b82.zip
DMG no longer stops running. (bugreport:1155)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12488 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/unit.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 03cefb060..635277115 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ 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.
+2008/04/05
+ * DMG no longer stops running. (r12486) [Kevin]
2008/04/04
* PCs/Mobs/NPCs now block Leap(TK_HIGHJUMP) and sprint(TK_RUN). (r12485) [Kevin]
* Disconnect user when receive select egg packet with no menu open. (r12484) [Kevin]
diff --git a/src/map/unit.c b/src/map/unit.c
index fa6c075db..bd738e786 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -660,8 +660,9 @@ int unit_stop_walking(struct block_list *bl,int type)
if(bl->type == BL_PET && type&~0xff)
ud->canmove_tick = gettick() + (type>>8);
- if (ud->state.running)
- status_change_end(bl, SC_RUN, -1);
+ //Don't stop running because of dmg, just apply the instant stop then keep running [Kevin]
+ //if (ud->state.running)
+ // status_change_end(bl, SC_RUN, -1);
return 1;
}