summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-10 17:52:46 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-10 17:52:46 +0000
commitcd5f05d223b9440d135539f374aa81eb4ba4801b (patch)
treefcc25e718e4b958c56b88751f7aab2c08e78a075
parent7eb8ad1d42c967adfafd30c13e37ab2ca26574cc (diff)
downloadhercules-cd5f05d223b9440d135539f374aa81eb4ba4801b.tar.gz
hercules-cd5f05d223b9440d135539f374aa81eb4ba4801b.tar.bz2
hercules-cd5f05d223b9440d135539f374aa81eb4ba4801b.tar.xz
hercules-cd5f05d223b9440d135539f374aa81eb4ba4801b.zip
Attempt to fix unwanted teleporting of immobile mobs
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10525 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/mob.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 0a0f06bb8..519fd41a7 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.
+2007/05/11
+ * Attempt to fix unwanted teleporting of immobile mobs [Playtester]
2007/05/10
* Adapted the shortlist to use a static array instead of a linked list and
enabled it.
diff --git a/src/map/mob.c b/src/map/mob.c
index 8942c4c1a..4e97c1bef 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1045,7 +1045,10 @@ int mob_randomwalk(struct mob_data *md,int tick)
nullpo_retr(0, md);
- if(DIFF_TICK(md->next_walktime,tick)>0 || md->state.no_random_walk || !unit_can_move(&md->bl))
+ if(DIFF_TICK(md->next_walktime,tick)>0 ||
+ md->state.no_random_walk ||
+ !unit_can_move(&md->bl) ||
+ !(status_get_mode(&md->bl)&MD_CANMOVE))
return 0;
d =12-md->move_fail_count;