summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-21 01:53:55 +0000
committerajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-21 01:53:55 +0000
commitd8f6e45557a5966356e867c8ca2d6122e992b531 (patch)
treeb9fac4b912d5ef816e716ee1567a4fc642d589b1
parent29130caae63aa51b0e32d4065d95e9f4ca13fcb3 (diff)
downloadhercules-d8f6e45557a5966356e867c8ca2d6122e992b531.tar.gz
hercules-d8f6e45557a5966356e867c8ca2d6122e992b531.tar.bz2
hercules-d8f6e45557a5966356e867c8ca2d6122e992b531.tar.xz
hercules-d8f6e45557a5966356e867c8ca2d6122e992b531.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@691 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt1
-rw-r--r--src/map/map.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Changelog.txt b/Changelog.txt
index ce1eecf50..ff01304cd 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
12/20
+ * Fixed map loading. If a map was not found, it would remove the next map in the list [Ajarn]
* Moddified some *_athena.conf's (my typos and some inncorect default values) [Ajarn]
* Added Valaris' double connection bug fix (imalive watchdog) [Valaris]
* Fixed map-server exiting when it came across a bad NPC file [Codemaster]
diff --git a/src/map/map.c b/src/map/map.c
index 2327ef7df..134250cdb 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1704,6 +1704,7 @@ int map_readallmap(void) {
if(map_readmap(i,fn, p) == -1) {
map_delmap(map[i].name);
maps_removed++;
+ i--;
} else {
if (last_time != time(0)) {
last_time = time(0);