summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.c10
-rw-r--r--src/char/char.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/char/char.c b/src/char/char.c
index aa58db78c..140761d00 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -42,6 +42,10 @@
#include <stdio.h>
#include <stdlib.h>
+// private declarations
+#define CHAR_CONF_NAME "conf/char_athena.conf"
+#define LAN_CONF_NAME "conf/subnet_athena.conf"
+
#ifndef TXT_SQL_CONVERT
struct mmo_map_server {
uint32 ip;
@@ -4018,8 +4022,8 @@ int char_config_read(const char *cfgName)
FILE* fp = fopen(cfgName, "r");
if (fp == NULL) {
- ShowFatalError("Configuration file not found: %s.\n", cfgName);
- exit(1);
+ ShowError("Configuration file not found: %s.\n", cfgName);
+ return 1;
}
ShowInfo("Reading configuration file %s...\n", cfgName);
@@ -4278,7 +4282,7 @@ int do_init(int argc, char **argv)
mapindex_init(); //Needed here for the start-point reading.
start_point.map = mapindex_name2id("new_zone01");
char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]);
- char_lan_config_read((argc > 3) ? argv[3] : LOGIN_LAN_CONF_NAME);
+ char_lan_config_read((argc > 3) ? argv[3] : LAN_CONF_NAME);
if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) {
ShowError("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
diff --git a/src/char/char.h b/src/char/char.h
index 947d12d3f..ded9a9b2e 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -10,10 +10,6 @@
#define START_CHAR_NUM 150000
#define MAX_MAP_SERVERS 30
-#define CHAR_CONF_NAME "conf/char_athena.conf"
-
-#define LOGIN_LAN_CONF_NAME "conf/subnet_athena.conf"
-
#define DEFAULT_AUTOSAVE_INTERVAL 300*1000
struct character_data {