summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-01 16:31:29 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-01 16:31:29 +0000
commitf9b1682603fee23ba36ff04fbdc303dd0b7cf0ef (patch)
treea77f574da96776aab02720a457c9c4692dbef25b
parent5cb60d195ab9ce1fe6edc9bc8d2d39f13fd129e5 (diff)
downloadhercules-f9b1682603fee23ba36ff04fbdc303dd0b7cf0ef.tar.gz
hercules-f9b1682603fee23ba36ff04fbdc303dd0b7cf0ef.tar.bz2
hercules-f9b1682603fee23ba36ff04fbdc303dd0b7cf0ef.tar.xz
hercules-f9b1682603fee23ba36ff04fbdc303dd0b7cf0ef.zip
- Forgot to made Tatami Gaeshi state (proyectile blocking) end when you move.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9945 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/map.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 0cd5b19e7..3a29e0ce5 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/03/02
+ * Tatami Gaeshi state (proyectile blocking) now ends when you move.
* SG Union will consume now SP if you use it while not soul linked.
* Added variable "skip" to the mob spawn data, to know how many mobs to
skip when spawning because they were not removed due to the
diff --git a/src/map/map.c b/src/map/map.c
index e69d5956c..658628b55 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -496,6 +496,8 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick) {
// status_change_end(bl, SC_BLADESTOP, -1);
if (sc->data[SC_BASILICA].timer != -1)
status_change_end(bl, SC_BASILICA, -1);
+ if (sc->data[SC_TATAMIGAESHI].timer != -1)
+ status_change_end(bl, SC_TATAMIGAESHI, -1);
}
}
if (moveblock) map_delblock_sub(bl,0);