From 236f3f46336cf648284b28a6b4bf7ffcec27fbd4 Mon Sep 17 00:00:00 2001 From: celest Date: Wed, 16 Mar 2005 12:21:26 +0000 Subject: * Updated jA's dummy socket to mod1137 * Added jA's ddos protection system * Moved stall_time's reading to packet_athena.conf git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1237 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/map.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/map/map.c') diff --git a/src/map/map.c b/src/map/map.c index 7c8275cf9..3a6a29fde 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2896,8 +2896,10 @@ int inter_config_read(char *cfgName) i=sscanf(line,"%[^:]: %[^\r\n]",w1,w2); if(i!=2) continue; - if(strcmpi(w1,"stall_time")==0){ - stall_time_ = atoi(w2); + //support the import command, just like any other config + if(strcmpi(w1,"import")==0){ + inter_config_read(w2); + } #ifndef TXT_ONLY } else if(strcmpi(w1,"item_db_db")==0){ strcpy(item_db_db,w2); @@ -2959,9 +2961,6 @@ int inter_config_read(char *cfgName) } else if(strcmpi(w1,"log_db_port")==0) { log_db_port = atoi(w2); #endif - //support the import command, just like any other config - } else if(strcmpi(w1,"import")==0){ - inter_config_read(w2); } } fclose(fp); -- cgit v1.2.3-70-g09d2