Merge pull request #3 from shennetsind/master

Dropping _athena conf suffixes

3 files changed, 6 insertions, 6 deletions

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 <stdlib.h>
 
 // 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;