- moduly pouzivaju space_t

- drobne upravy



git-svn-id: http://opensvn.csie.org/tuxanci_ng@64 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

1 files changed, 21 insertions, 19 deletions

diff --git a/src/arenaFile.c b/src/arenaFile.c
index 52f31c0..a3383e4 100644
--- a/src/arenaFile.c
+++ b/src/arenaFile.c
@@ -33,6 +33,26 @@ bool_t isAreaFileInicialized()
 	return isArenaFileInit;
 }
 
+static void cmd_arena(arena_t **arena, char *line)
+{
+	char str_image[STR_SIZE];
+	char str_w[STR_SIZE];
+	char str_h[STR_SIZE];
+
+	if( getValue(line, "background", str_image, STR_SIZE) != 0 )return;
+	if( getValue(line, "w", str_w, STR_SIZE) != 0 )return;
+	if( getValue(line, "h", str_h, STR_SIZE) != 0 )return;
+
+	(*arena) = newArena(atoi(str_w), atoi(str_h));
+#ifndef PUBLIC_SERVER
+	(*arena)->background = getImage(IMAGE_GROUP_USER, str_image);
+#endif
+	//(*arena)->w = atoi(str_w);
+	//(*arena)->h = atoi(str_h);
+	setCurrentArena(*arena);
+	printf("new arena\n");
+}
+
 static void cmd_loadModule(char *line)
 {
 	char str_file[STR_SIZE];
@@ -68,24 +88,6 @@ static void cmd_loadMusic(char *line)
 	addMusic(str_file, str_name, MUSIC_GROUP_USER);
 }
 
-static void cmd_arena(arena_t **arena, char *line)
-{
-	char str_image[STR_SIZE];
-	char str_w[STR_SIZE];
-	char str_h[STR_SIZE];
-
-	if( getValue(line, "background", str_image, STR_SIZE) != 0 )return;
-	if( getValue(line, "w", str_w, STR_SIZE) != 0 )return;
-	if( getValue(line, "h", str_h, STR_SIZE) != 0 )return;
-
-	(*arena) = newArena(atoi(str_w), atoi(str_h));
-	(*arena)->background = getImage(IMAGE_GROUP_USER, str_image);
-	//(*arena)->w = atoi(str_w);
-	//(*arena)->h = atoi(str_h);
-	setCurrentArena(*arena);
-	printf("new arena\n");
-}
-
 static void cmd_playMusic(arena_t *arena, char *line)
 {
 	char str_music[STR_SIZE];
@@ -181,10 +183,10 @@ arena_t* getArena(int id)
 #ifndef PUBLIC_SERVER
 		if( strncmp(line, "loadImage", 9) == 0 )cmd_loadImage(line);
 		if( strncmp(line, "loadMusic", 9) == 0 )cmd_loadMusic(line);
-		if( strncmp(line, "arena", 5) == 0 )cmd_arena(&arena, line);
 		if( strncmp(line, "playMusic", 9) == 0 )cmd_playMusic(arena, line);
 #endif
 
+		if( strncmp(line, "arena", 5) == 0 )cmd_arena(&arena, line);
 		if( strncmp(line, "loadModule", 10) == 0 )cmd_loadModule(line);
 		//if( strncmp(line, "wall", 4) == 0 )cmd_wall(arena, line);
 		//if( strncmp(line, "teleport", 8) == 0 )cmd_teleport(arena, line);