diff options
| author | codemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-04 22:13:58 +0000 |
|---|---|---|
| committer | codemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-04 22:13:58 +0000 |
| commit | dc28241d3c6716fed00b78d9a6977f89c4644178 (patch) | |
| tree | 33a7686aa2a53ddfebe68d0e2288e0434f98ee5d /src/map/map.c | |
| parent | 51f5bae697fac9db3af051bcb5c156c94984fc18 (diff) | |
| download | hercules-dc28241d3c6716fed00b78d9a6977f89c4644178.tar.gz hercules-dc28241d3c6716fed00b78d9a6977f89c4644178.tar.bz2 hercules-dc28241d3c6716fed00b78d9a6977f89c4644178.tar.xz hercules-dc28241d3c6716fed00b78d9a6977f89c4644178.zip | |
* Fixed GM Command Logging (Not sure why TXT logging still isn't working properly :( ) [Codemaster] [SVN 907]
* Fixed one of Lupus' additions to the item_db [Codemaster] [SVN 907]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@907 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/map.c b/src/map/map.c index ae99c477b..0ba13519f 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2680,8 +2680,8 @@ int do_init(int argc, char *argv[]) { #ifndef TXT_ONLY unsigned char *SQL_CONF_NAME="conf/inter_athena.conf"; - unsigned char *LOG_CONF_NAME="conf/log_athena.conf"; #endif + unsigned char *LOG_CONF_NAME="conf/log_athena.conf"; unsigned char *MAP_CONF_NAME = "conf/map_athena.conf"; unsigned char *BATTLE_CONF_FILENAME = "conf/battle_athena.conf"; unsigned char *ATCOMMAND_CONF_FILENAME = "conf/atcommand_athena.conf"; @@ -2715,10 +2715,10 @@ int do_init(int argc, char *argv[]) { GRF_PATH_FILENAME = argv[i+1]; #ifndef TXT_ONLY else if (strcmp(argv[i],"--sql_config") == 0 || strcmp(argv[i],"--sql-config") == 0) - SQL_CONF_NAME = argv[i+1]; - else if (strcmp(argv[i],"--log_config") == 0 || strcmp(argv[i],"--log-config") == 0) - LOG_CONF_NAME = argv[i+1]; + SQL_CONF_NAME = argv[i+1]; #endif /* not TXT_ONLY */ + else if (strcmp(argv[i],"--log_config") == 0 || strcmp(argv[i],"--log-config") == 0) + LOG_CONF_NAME = argv[i+1]; else if (strcmp(argv[i],"--run_once") == 0) // close the map-server as soon as its done.. for testing [Celest] runflag = 0; } @@ -2758,8 +2758,8 @@ int do_init(int argc, char *argv[]) { script_config_read(SCRIPT_CONF_NAME); #ifndef TXT_ONLY sql_config_read(SQL_CONF_NAME); - log_config_read(LOG_CONF_NAME); #endif /* not TXT_ONLY */ + log_config_read(LOG_CONF_NAME); atexit(do_final); |