summaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
Diffstat (limited to 'src/base')
-rw-r--r--src/base/arenaFile.c12
-rw-r--r--src/base/arenaFile.h1
-rw-r--r--src/base/proto.c3
3 files changed, 13 insertions, 3 deletions
diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c
index 6c50d34..10b4449 100644
--- a/src/base/arenaFile.c
+++ b/src/base/arenaFile.c
@@ -15,6 +15,7 @@
#include "director.h"
#include "modules.h"
#include "archive.h"
+#include "homeDirector.h"
#ifndef PUBLIC_SERVER
#include "configFile.h"
@@ -301,6 +302,11 @@ void destroyArenaFile(arenaFile_t *p)
free(p);
}
+void loadArenaFile(char *path)
+{
+ addList(listArenaFile, newArenaFile(path) );
+}
+
void initArenaFile()
{
director_t *p;
@@ -311,7 +317,10 @@ void initArenaFile()
#endif
isArenaFileInit = TRUE;
listArenaFile = newList();
+
p = loadDirector(PATH_ARENA);
+ //p = loadDirector( getHomeDirector() );
+
for (i = 0; i < p->list->count; i++) {
char *line;
@@ -326,8 +335,7 @@ void initArenaFile()
printf(_("Loading arena: %s\n"), line);
#endif
accessExistFile(path);
-
- addList(listArenaFile, newArenaFile(path));
+ loadArenaFile(path);
}
}
//printf("No. of Arens: %d\n", listArenaFile->count);
diff --git a/src/base/arenaFile.h b/src/base/arenaFile.h
index 4f1cdc5..652cdf0 100644
--- a/src/base/arenaFile.h
+++ b/src/base/arenaFile.h
@@ -28,6 +28,7 @@ extern arenaFile_t* getArenaFile(int n);
extern int getArenaFileID(arenaFile_t *arenaFile);
extern arena_t* getArena(arenaFile_t *arenaFile);
extern arenaFile_t* newArenaFile(char *path);
+extern void loadArenaFile(char *path);
extern void initArenaFile();
extern void quitArenaFile();
diff --git a/src/base/proto.c b/src/base/proto.c
index 5097146..304eff8 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -25,6 +25,7 @@
#include "screen_setting.h"
#include "screen_choiceArena.h"
#include "screen_analyze.h"
+#include "screen_downArena.h"
#include "client.h"
#include "term.h"
#include "radar.h"
@@ -379,7 +380,7 @@ void proto_recv_init_client(char *msg)
}
proto_send_check_client(check_id);
-
+
if( getCurrentArena() != NULL )
{
return;