summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-15 03:28:11 -0200
committershennetsind <ind@henn.et>2013-11-15 03:28:11 -0200
commitcdf6dc90768b1b524c78e3a172c7a844dd88a943 (patch)
tree4d8859658a9a3b018319646c73de7911fd25dbf4 /src
parent5b9ce296cb99a54c5d2c5254c64154271b933917 (diff)
downloadhercules-cdf6dc90768b1b524c78e3a172c7a844dd88a943.tar.gz
hercules-cdf6dc90768b1b524c78e3a172c7a844dd88a943.tar.bz2
hercules-cdf6dc90768b1b524c78e3a172c7a844dd88a943.tar.xz
hercules-cdf6dc90768b1b524c78e3a172c7a844dd88a943.zip
Fixed db2sql plugin forcing minimal mode
Would turn map server into minimal mode regardless of the --db2sql option being used. Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src')
-rw-r--r--src/map/map.c7
-rw-r--r--src/plugins/db2sql.c6
2 files changed, 5 insertions, 8 deletions
diff --git a/src/map/map.c b/src/map/map.c
index b0ae2f340..24fbeefa0 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2912,7 +2912,7 @@ int map_addmap(const char* mapname) {
}
void map_delmapid(int id) {
- ShowNotice("Removing map [ %s ] from map->list"CL_CLL"\n",map->list[id].name);
+ ShowNotice("Removing map [ %s ] from maplist"CL_CLL"\n",map->list[id].name);
memmove(map->list+id, map->list+id+1, sizeof(map->list[0])*(map->count-id-1));
map->count--;
}
@@ -5438,7 +5438,6 @@ int do_init(int argc, char *argv[])
HPM->event(HPET_PRE_INIT);
- minimal = map->minimal;/* temp (perhaps make minimal a mask with options of what to load? e.g. plugin 1 does minimal |= mob_db; */
for( i = 1; i < argc ; i++ ) {
const char* arg = argv[i];
@@ -5481,7 +5480,7 @@ int do_init(int argc, char *argv[])
} else if( strcmp(arg, "run-once") == 0 ) { // close the map-server as soon as its done.. for testing [Celest]
runflag = CORE_ST_STOP;
} else if( strcmp(arg, "script-check") == 0 ) {
- minimal = true;
+ map->minimal = true;
runflag = CORE_ST_STOP;
if( map->arg_next_value(arg, i, argc, true) )
scriptcheck = argv[++i];
@@ -5504,7 +5503,7 @@ int do_init(int argc, char *argv[])
}
}
}
-
+ minimal = map->minimal;/* temp (perhaps make minimal a mask with options of what to load? e.g. plugin 1 does minimal |= mob_db; */
if (!minimal) {
map->config_read(map->MAP_CONF_NAME);
CREATE(map->list,struct map_data,map->count);
diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c
index 47c85c2f0..169aa8693 100644
--- a/src/plugins/db2sql.c
+++ b/src/plugins/db2sql.c
@@ -180,7 +180,7 @@ CPCMD(db2sql) {
do_db2sql();
}
void db2sql_arg(char *param) {
- torun = true;
+ map->minimal = torun = true;
}
HPExport void server_preinit (void) {
h_config_setting_lookup_string = GET_SYMBOL("config_setting_lookup_string");
@@ -192,9 +192,7 @@ HPExport void server_preinit (void) {
strlib = GET_SYMBOL("strlib");
iMalloc = GET_SYMBOL("iMalloc");
- addArg("--db2sql",false,db2sql_arg,NULL);
-
- map->minimal = true;
+ addArg("--db2sql",false,db2sql_arg,NULL);
}
HPExport void plugin_init (void) {
HPMi->addCPCommand("server:tools:db2sql",CPCMD_A(db2sql));