summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-15 11:14:45 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-15 11:14:45 +0000
commit0d67a194537e8e69426c8f55ced61b0a8701e90a (patch)
treea0dffc2e7af02443e1189e6b4e724414625eb43b /conf
parentf16b914ef2bf3f75e1ee42f2277927660acd0116 (diff)
downloadhercules-0d67a194537e8e69426c8f55ced61b0a8701e90a.tar.gz
hercules-0d67a194537e8e69426c8f55ced61b0a8701e90a.tar.bz2
hercules-0d67a194537e8e69426c8f55ced61b0a8701e90a.tar.xz
hercules-0d67a194537e8e69426c8f55ced61b0a8701e90a.zip
Split off mapreg code from script.c
* new mapserver files, mapreg.h, mapreg_txt.c, mapreg_sql.c * removed MAPREGSQL from project files / makefiles * mapreg storage engine is now fully dependent on the server type * added config settings mapreg_txt and mapreg_db to inter config * added get_str() function to complement add_str() * fixed txt mapreg code allowing too long variable names git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13081 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
-rw-r--r--conf/Changelog.txt2
-rw-r--r--conf/inter_athena.conf4
-rw-r--r--conf/map_athena.conf2
3 files changed, 6 insertions, 2 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 6884ffc0b..ebcf65639 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
+2008/08/13
+ * Added config settings mapreg_txt and mapreg_db to inter config [ultramage]
2008/08/10
* Removed duplicate gef_cas mapflags [Yommy]
2008/08/01
diff --git a/conf/inter_athena.conf b/conf/inter_athena.conf
index 9d8a1917b..00d3f155f 100644
--- a/conf/inter_athena.conf
+++ b/conf/inter_athena.conf
@@ -38,6 +38,9 @@ castle_txt: save/castle.txt
// Status change flatfile database, for status changes that are saved between sessions.
scdata_txt: save/scdata.txt
+// Mapserver permanent script variables ($-type)
+mapreg_txt: save/mapreg.txt
+
// SQL version options only
@@ -114,6 +117,7 @@ item_db_db: item_db
item_db2_db: item_db2
mob_db_db: mob_db
mob_db2_db: mob_db2
+mapreg_db: mapreg
//Use SQL item_db and mob_db for the map server
use_sql_db: no
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 5859008ca..fcd368668 100644
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -121,8 +121,6 @@ help_txt: conf/help.txt
help2_txt: conf/help2.txt
charhelp_txt: conf/charhelp.txt
-mapreg_txt: save/mapreg.txt
-
// Scripts
import: npc/scripts_main.conf