diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/arenaFile.c | 4 | ||||
| -rw-r--r-- | src/server/publicServer.c | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c index cb3ceb2..117851a 100644 --- a/src/base/arenaFile.c +++ b/src/base/arenaFile.c @@ -378,8 +378,10 @@ void initArenaFile() listArenaFile = newList(); loadArenaFromDirector(PATH_ARENA); - loadArenaFromDirector(getHomeDirector()); +#ifndef PUBLIC_SERVER + loadArenaFromDirector(getHomeDirector()); +#endif } void quitArenaFile() diff --git a/src/server/publicServer.c b/src/server/publicServer.c index 21f2891..10ac39f 100644 --- a/src/server/publicServer.c +++ b/src/server/publicServer.c @@ -224,9 +224,16 @@ static int initPublicServerNetwork() static void loadArena() { - choice_arenaFile = - getArenaFileFormNetName(getSetting("ARENA", "--arena", "FAGN")); + choice_arenaFile = getArenaFileFormNetName(getSetting("ARENA", "--arena", "FAGN")); + + if( choice_arenaFile == NULL ) + { + fprintf(stderr, _("I dont load arena %s!\n"), getSetting("ARENA", "--arena", "FAGN")); + exit(-1); + } + arena = getArena(choice_arenaFile); + setCurrentArena(arena); } @@ -243,9 +250,7 @@ int initPublicServer() initShot(); initServerConfigFile(); - ret = - initLog(getSetting - ("LOG_FILE", "--log-file", "/tmp/tuxanci-server.log")); + ret = initLog(getSetting("LOG_FILE", "--log-file", "/tmp/tuxanci-server.log")); if (ret < 0) { fprintf(stderr, _("I was unable to open config file!\n")); |