diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-15 11:14:45 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-15 11:14:45 +0000 |
| commit | 0d67a194537e8e69426c8f55ced61b0a8701e90a (patch) | |
| tree | a0dffc2e7af02443e1189e6b4e724414625eb43b /src/map/map.c | |
| parent | f16b914ef2bf3f75e1ee42f2277927660acd0116 (diff) | |
| download | hercules-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 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/map.c b/src/map/map.c index 0d82094cf..36db8ebb2 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -32,6 +32,7 @@ #include "unit.h" #include "battle.h" #include "script.h" +#include "mapreg.h" #include "guild.h" #include "pet.h" #include "mercenary.h" @@ -2932,9 +2933,6 @@ int map_config_read(char *cfgName) if (strcmpi(w1, "charhelp_txt") == 0) strcpy(charhelp_txt, w2); else - if (strcmpi(w1, "mapreg_txt") == 0) - strcpy(mapreg_txt, w2); - else if(strcmpi(w1,"map_cache_file") == 0) strncpy(map_cache_file,w2,255); else @@ -3034,6 +3032,9 @@ int inter_config_read(char *cfgName) if(strcmpi(w1,"log_db_db")==0) strcpy(log_db_db, w2); #endif + else + if( mapreg_config_read(w1,w2) ) + continue; //support the import command, just like any other config else if(strcmpi(w1,"import")==0) |