From cf0e8e7563e4273137c8a582d66fe4fcc6c283fa Mon Sep 17 00:00:00 2001 From: shennetsind Date: Fri, 25 Jan 2013 14:02:43 -0200 Subject: Dropping _athena file suffixes Signed-off-by: shennetsind --- src/char/char.c | 8 ++++---- src/char/inter.c | 2 +- src/char/inter.h | 2 +- src/common/socket.c | 2 +- src/login/login.h | 4 ++-- src/map/atcommand.c | 6 +++--- src/map/battle.h | 2 +- src/map/chrif.c | 2 +- src/map/map.c | 18 +++++++++--------- 9 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/char/char.c b/src/char/char.c index 8bf2dee38..f21730d3b 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -30,9 +30,9 @@ #include // private declarations -#define CHAR_CONF_NAME "conf/char_athena.conf" -#define LAN_CONF_NAME "conf/subnet_athena.conf" -#define SQL_CONF_NAME "conf/inter_athena.conf" +#define CHAR_CONF_NAME "conf/char-server.conf" +#define LAN_CONF_NAME "conf/subnet.conf" +#define SQL_CONF_NAME "conf/inter-server.conf" char char_db[256] = "char"; char scdata_db[256] = "sc_data"; @@ -2091,7 +2091,7 @@ int parse_fromlogin(int fd) { ShowError("Can not connect to login-server.\n"); ShowError("The server communication passwords (default s1/p1) are probably invalid.\n"); ShowError("Also, please make sure your login db has the correct communication username/passwords and the gender of the account is S.\n"); - ShowError("The communication passwords are set in map_athena.conf and char_athena.conf\n"); + ShowError("The communication passwords are set in /conf/map-server.conf and /conf/char-server.conf\n"); set_eof(fd); return 0; } else { diff --git a/src/char/inter.c b/src/char/inter.c index 8faff42c1..8ff10e290 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -791,7 +791,7 @@ int inter_init_sql(const char *file) inter_auction_sql_init(); geoip_readdb(); - msg_config_read("conf/msg_athena.conf"); + msg_config_read("conf/messages.conf"); return 0; } diff --git a/src/char/inter.h b/src/char/inter.h index 7ea9cf25c..9f99197eb 100644 --- a/src/char/inter.h +++ b/src/char/inter.h @@ -16,7 +16,7 @@ int mapif_disconnectplayer(int fd, int account_id, int char_id, int reason); int inter_log(char *fmt,...); -#define inter_cfgName "conf/inter_athena.conf" +#define inter_cfgName "conf/inter-server.conf" extern unsigned int party_share_level; diff --git a/src/common/socket.c b/src/common/socket.c index d24a9c1d8..6977d4257 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -1262,7 +1262,7 @@ int socket_getips(uint32* ips, int max) void socket_init(void) { - char *SOCKET_CONF_FILENAME = "conf/packet_athena.conf"; + char *SOCKET_CONF_FILENAME = "conf/packet.conf"; unsigned int rlim_cur = FD_SETSIZE; #ifdef WIN32 diff --git a/src/login/login.h b/src/login/login.h index bedf5e179..7ed556628 100644 --- a/src/login/login.h +++ b/src/login/login.h @@ -14,8 +14,8 @@ enum E_LOGINSERVER_ST LOGINSERVER_ST_LAST }; -#define LOGIN_CONF_NAME "conf/login_athena.conf" -#define LAN_CONF_NAME "conf/subnet_athena.conf" +#define LOGIN_CONF_NAME "conf/login-server.conf" +#define LAN_CONF_NAME "conf/subnet.conf" // supported encryption types: 1- passwordencrypt, 2- passwordencrypt2, 3- both #define PASSWORDENC 3 diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 2a18b7d2f..e54166019 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -3668,7 +3668,7 @@ ACMD_FUNC(reloadskilldb) } /*========================================== - * @reloadatcommand - reloads atcommand_athena.conf groups.conf + * @reloadatcommand - reloads conf/atcommand.conf conf/groups.conf *------------------------------------------*/ void atcommand_doload(); ACMD_FUNC(reloadatcommand) { @@ -3682,7 +3682,7 @@ ACMD_FUNC(reloadatcommand) { config_destroy(&run_test); if (conf_read_file(&run_test, ATCOMMAND_CONF_FILENAME)) { - clif_displaymessage(fd, msg_txt(1037)); // Error reading atcommand_athena.conf, reload failed. + clif_displaymessage(fd, msg_txt(1037)); // Error reading atcommand.conf, reload failed. return -1; } @@ -3694,7 +3694,7 @@ ACMD_FUNC(reloadatcommand) { return 0; } /*========================================== - * @reloadbattleconf - reloads battle_athena.conf + * @reloadbattleconf - reloads /conf/battle.conf *------------------------------------------*/ ACMD_FUNC(reloadbattleconf) { diff --git a/src/map/battle.h b/src/map/battle.h index 12ce62c8b..1c1b1d38c 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -382,7 +382,7 @@ extern struct Battle_Config int debuff_on_logout; // Removes a few "official" negative Scs on logout. [Skotlex] int mob_ai; //Configures various mob_ai settings to make them smarter or dumber(official). [Skotlex] int hom_setting; //Configures various homunc settings which make them behave unlike normal characters.. [Skotlex] - int dynamic_mobs; // Dynamic Mobs [Wizputer] - battle_athena flag implemented by [random] + int dynamic_mobs; // Dynamic Mobs [Wizputer] - battle.conf flag implemented by [random] int mob_remove_damaged; // Dynamic Mobs - Remove mobs even if damaged [Wizputer] int mob_remove_delay; // Dynamic Mobs - delay before removing mobs from a map [Skotlex] int mob_active_time; //Duration through which mobs execute their Hard AI after players leave their area of sight. diff --git a/src/map/chrif.c b/src/map/chrif.c index 1575e11f4..e109f7095 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -232,7 +232,7 @@ void chrif_checkdefaultlogin(void) { if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) { ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n"); ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n"); - ShowNotice("and then edit your user/password in conf/map_athena.conf (or conf/import/map_conf.txt)\n"); + ShowNotice("and then edit your user/password in conf/map-server.conf (or conf/import/map_conf.txt)\n"); } } 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"); -- cgit v1.2.3-60-g2f50