diff options
| author | shennetsind <notind@gmail.com> | 2013-01-25 12:45:18 -0800 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-01-25 12:45:18 -0800 |
| commit | 762ea882f34c7821541135e32e217beb7930a52c (patch) | |
| tree | 89d1ef06a067e74dda88575bc0e6dd655f8ada93 /src/map/map.c | |
| parent | 6864c961e1cfad9650d2343bf94a9e6b197360e3 (diff) | |
| parent | 754af15505f32237f8063e51ae9a1cb90788dff4 (diff) | |
| download | hercules-762ea882f34c7821541135e32e217beb7930a52c.tar.gz hercules-762ea882f34c7821541135e32e217beb7930a52c.tar.bz2 hercules-762ea882f34c7821541135e32e217beb7930a52c.tar.xz hercules-762ea882f34c7821541135e32e217beb7930a52c.zip | |
Merge pull request #3 from shennetsind/master
Dropping _athena conf suffixes
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/map/map.c b/src/map/map.c index f6468e180..a8521de7d 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3184,7 +3184,7 @@ int parse_console(const char* buf) } /*========================================== - * Read map server configuration files (conf/map_athena.conf...) + * Read map server configuration files (conf/map_server.conf...) *------------------------------------------*/ int map_config_read(char *cfgName) { @@ -3746,13 +3746,13 @@ int do_init(int argc, char *argv[]) GC_enable_incremental(); #endif - INTER_CONF_NAME="conf/inter_athena.conf"; - LOG_CONF_NAME="conf/log_athena.conf"; - MAP_CONF_NAME = "conf/map_athena.conf"; - BATTLE_CONF_FILENAME = "conf/battle_athena.conf"; - ATCOMMAND_CONF_FILENAME = "conf/atcommand_athena.conf"; - SCRIPT_CONF_NAME = "conf/script_athena.conf"; - MSG_CONF_NAME = "conf/msg_athena.conf"; + INTER_CONF_NAME="conf/inter-server.conf"; + LOG_CONF_NAME="conf/logs.conf"; + MAP_CONF_NAME = "conf/map-server.conf"; + BATTLE_CONF_FILENAME = "conf/battle.conf"; + ATCOMMAND_CONF_FILENAME = "conf/atcommand.conf"; + SCRIPT_CONF_NAME = "conf/script.conf"; + MSG_CONF_NAME = "conf/messages.conf"; GRF_PATH_FILENAME = "conf/grf-files.txt"; rnd_init(); @@ -3855,7 +3855,7 @@ int do_init(int argc, char *argv[]) char ip_str[16]; ip2str(addr_[0], ip_str); - ShowWarning("Not all IP addresses in map_athena.conf configured, autodetecting...\n"); + ShowWarning("Not all IP addresses in /conf/map-server.conf configured, autodetecting...\n"); if (naddr_ == 0) ShowError("Unable to determine your IP address...\n"); |