summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-03 02:59:53 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-03 02:59:53 +0000
commitf31c0a1b72bc5b7f36e211c26ddd5d688b2b3d5d (patch)
tree4c4e58543af8aa2cfc74c0b448d788fb3c5095e9
parent557dea285150a612bb45afaad68b02154df9ff93 (diff)
downloadhercules-f31c0a1b72bc5b7f36e211c26ddd5d688b2b3d5d.tar.gz
hercules-f31c0a1b72bc5b7f36e211c26ddd5d688b2b3d5d.tar.bz2
hercules-f31c0a1b72bc5b7f36e211c26ddd5d688b2b3d5d.tar.xz
hercules-f31c0a1b72bc5b7f36e211c26ddd5d688b2b3d5d.zip
* Fix 'awake' not working (bugreport:2580)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13717 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/script.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c5bb0be5f..567244eb5 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2009/05/03
* Do not log damage if it's done by mob itself (bugreport:2933) [Inkfish]
+ * Fix 'awake' not working (bugreport:2580) [Inkfish]
2009/05/02
* Spirit of Bard and Dancer now only works for mastered skills (bugreport:3037) [Playtester]
- also fixed an outdated comment in the source code
diff --git a/src/map/script.c b/src/map/script.c
index 0aa92003a..0bd5bbb35 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -12921,7 +12921,7 @@ BUILDIN_FUNC(awake)
delete_timer(tst->sleep.timer, run_script_timer);
node = script_erase_sleepdb(node);
tst->sleep.timer = INVALID_TIMER;
- tst->sleep.tick = 0;
+ //tst->sleep.tick = 0;
run_script_main(tst);
}
else