diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-10 06:32:17 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-10 06:32:17 +0000 |
| commit | 72321b062923247d9d844828363de609cc2fa849 (patch) | |
| tree | 4b12755075690a91eb12664bd7144b4c74b03f23 | |
| parent | 77523746c63bc08f261bb68b7aa2492b0ba6546b (diff) | |
| download | hercules-72321b062923247d9d844828363de609cc2fa849.tar.gz hercules-72321b062923247d9d844828363de609cc2fa849.tar.bz2 hercules-72321b062923247d9d844828363de609cc2fa849.tar.xz hercules-72321b062923247d9d844828363de609cc2fa849.zip | |
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@531 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog.txt | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt index 869344cfa..55d5e9c5c 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,7 @@ Date Added 12/9 + * Moved a map_freeblock_unlock() around to eliminate a + crash [MouseJstr] * Fixed how players are cleaned up when they disconnected during authentication [MouseJstr] * Adjusted some messages in @marry [MouseJstr] diff --git a/src/map/mob.c b/src/map/mob.c index 12c69537a..bf8cbe293 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -764,9 +764,11 @@ static int mob_timer(int tid,unsigned int tick,int id,int data) printf("mob_timer : %d ?\n",md->state.state); break; } - map_freeblock_unlock(); + if (md->timer == -1) mob_changestate(md,MS_WALK,0); + + map_freeblock_unlock(); return 0; } |