summaryrefslogtreecommitdiff
path: root/src/char/char.c
diff options
context:
space:
mode:
authorshennetsind <notind@gmail.com>2013-01-25 12:45:18 -0800
committershennetsind <notind@gmail.com>2013-01-25 12:45:18 -0800
commit762ea882f34c7821541135e32e217beb7930a52c (patch)
tree89d1ef06a067e74dda88575bc0e6dd655f8ada93 /src/char/char.c
parent6864c961e1cfad9650d2343bf94a9e6b197360e3 (diff)
parent754af15505f32237f8063e51ae9a1cb90788dff4 (diff)
downloadhercules-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/char/char.c')
-rw-r--r--src/char/char.c8
1 files changed, 4 insertions, 4 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 {