summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-01 05:55:06 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-01 05:55:06 +0000
commitf1fd1e277edb4eec67380e378e486fe2756dbb7e (patch)
tree007e5ae005df4fe9ef59ba29074d86fe15217abe
parent7b6da851f876885e3c1a5cd7ad0d364d77404bf0 (diff)
downloadhercules-f1fd1e277edb4eec67380e378e486fe2756dbb7e.tar.gz
hercules-f1fd1e277edb4eec67380e378e486fe2756dbb7e.tar.bz2
hercules-f1fd1e277edb4eec67380e378e486fe2756dbb7e.tar.xz
hercules-f1fd1e277edb4eec67380e378e486fe2756dbb7e.zip
* Removed auto-add feature from mapindex code, as map indexes are used for save data, thus need to be constant across server starts (since r4726).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14807 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/common/mapindex.c10
-rw-r--r--src/common/mapindex.h3
3 files changed, 2 insertions, 13 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 99a3ffbbb..24abef588 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,5 +1,7 @@
Date Added
+2011/05/01
+ * Removed auto-add feature from mapindex code, as map indexes are used for save data, thus need to be constant across server starts (since r4726). [Ai4rei]
2011/04/28
* Fixed @makehomun not checking for existing homunculus properly and thus allowing to create a homunculus when one is already present but inactive (bugreport:4879, since r10272). [Ai4rei]
* Updated packet 0x163 (ZC_BAN_LIST) to reflect change in packet layout introduced with 2010-08-03aRagexeRE (bugreport:4881, follow up to r14718). [Ai4rei]
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index a1c86af97..be2913c69 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -128,18 +128,8 @@ unsigned short mapindex_name2id(const char* name)
if (strcmp(indexes[i].name,map_name)==0)
return i;
}
-#ifdef MAPINDEX_AUTOADD
- if( mapindex_addmap(i,map_name) )
- {
- ShowDebug("mapindex_name2id: Auto-added map \"%s\" to position %d\n", map_name, i);
- return i;
- }
- ShowWarning("mapindex_name2id: Failed to auto-add map \"%s\" to position %d!\n", map_name, i);
- return 0;
-#else
ShowDebug("mapindex_name2id: Map \"%s\" not found in index list!\n", map_name);
return 0;
-#endif
}
const char* mapindex_id2name(unsigned short id)
diff --git a/src/common/mapindex.h b/src/common/mapindex.h
index 06131d0a4..854669ea6 100644
--- a/src/common/mapindex.h
+++ b/src/common/mapindex.h
@@ -7,9 +7,6 @@
//File in charge of assigning a numberic ID to each map in existance for space saving when passing map info between servers.
extern char mapindex_cfgfile[80];
-//whether to enable auto-adding of maps during run. Not so secure as the map indexes will vary!
-//#define MAPINDEX_AUTOADD
-
#define MAX_MAPINDEX 2000
//Some definitions for the mayor city maps.