6 files changed, 68 insertions, 20 deletions

diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c
index 25e0582..6c50d34 100644
--- a/src/base/arenaFile.c
+++ b/src/base/arenaFile.c
@@ -61,6 +61,7 @@ int getArenaValue(char *line, char *env, char *val, int len)
 }
 
 
+#ifndef PUBLIC_SERVER
 image_t* loadImageFromArena(arenaFile_t *arenaFile, char *filename, char *group, char *name, int alpha)
 {
 	char *extractFile;
@@ -73,6 +74,18 @@ image_t* loadImageFromArena(arenaFile_t *arenaFile, char *filename, char *group,
 	return image;
 }
 
+#ifndef NO_SOUND
+void loadMusicFromArena(arenaFile_t *arenaFile, char *filename, char *group, char *name)
+{
+	char *extractFile;
+
+	extractFile = extractFileFromArchive(arenaFile->path, filename);
+	addMusic(extractFile, name, group);
+	deleteExtractFile(extractFile);
+}
+#endif
+#endif
+
 static void cmd_arena(arena_t **arena, char *line)
 {
 	char str_image[STR_SIZE];
@@ -121,13 +134,13 @@ static void cmd_loadImage(arenaFile_t *arenaFile, char *line)
 	if (getArenaValue(line, "alpha", str_alpha, STR_SIZE) != 0)
 		return;
 
-	printf("str_file=%s str_name=%s str_alpha=%s\n", str_file, str_name, str_alpha);
+	//printf("str_file=%s str_name=%s str_alpha=%s\n", str_file, str_name, str_alpha);
 	loadImageFromArena(arenaFile, str_file, IMAGE_GROUP_USER, str_name, isYesOrNO(str_alpha));
 
 	//addImageData(str_file, isYesOrNO(str_alpha), str_name, IMAGE_GROUP_USER);
 }
 
-static void cmd_loadMusic(char *line)
+static void cmd_loadMusic(arenaFile_t *arenaFile, char *line)
 {
 	char str_file[STR_SIZE];
 	char str_name[STR_SIZE];
@@ -137,7 +150,8 @@ static void cmd_loadMusic(char *line)
 	if (getArenaValue(line, "name", str_name, STR_SIZE) != 0)
 		return;
 #ifndef NO_SOUND
-	addMusic(str_file, str_name, MUSIC_GROUP_USER);
+	//addMusic(str_file, str_name, MUSIC_GROUP_USER);
+	loadMusicFromArena(arenaFile, str_file, MUSIC_GROUP_USER, str_name);
 #endif
 }
 
@@ -190,7 +204,7 @@ char *getArenaNetName(arenaFile_t *arenaFile)
 arenaFile_t* getArenaFileFormNetName(char *s)
 {
 	int i;
-
+// 
 	for (i = 0; i < listArenaFile->count; i++)
 	{
 		arenaFile_t *arenaFile;
@@ -213,6 +227,25 @@ arenaFile_t* getArenaFile(int n)
 	return (arenaFile_t *)listArenaFile->list[n];
 }
 
+int getArenaFileID(arenaFile_t *arenaFile)
+{
+	int i;
+
+	for (i = 0; i < listArenaFile->count; i++)
+	{
+		arenaFile_t *this;
+
+		this = (arenaFile_t *)listArenaFile->list[i];
+		
+		if( this == arenaFile)
+		{
+			return i;
+		}
+	}
+
+	return -1;
+}
+
 arena_t* getArena(arenaFile_t *arenaFile)
 {
 	textFile_t *ts;
@@ -230,7 +263,7 @@ arena_t* getArena(arenaFile_t *arenaFile)
 		if (strncmp(line, "loadImage", 9) == 0)
 			cmd_loadImage(arenaFile, line);
 		if (strncmp(line, "loadMusic", 9) == 0)
-			cmd_loadMusic(line);
+			cmd_loadMusic(arenaFile, line);
 		if (strncmp(line, "playMusic", 9) == 0)
 			cmd_playMusic(arena, line);
 #endif
@@ -254,7 +287,7 @@ arenaFile_t* newArenaFile(char *path)
 	new = malloc( sizeof(arenaFile_t) );
 	new->path = strdup(path);
 
-	extractFile = extractFileFromArchive(path, "mapa.map");
+	extractFile = extractFileFromArchive(path, "arena.map");
 	new->map = loadTextFile(extractFile);
 	deleteExtractFile(extractFile);
 
@@ -283,6 +316,7 @@ void initArenaFile()
 		char *line;
 	
 		line = (char *)( p->list->list[i] );
+
 		if (strstr(line, ".zip") != NULL &&
 			strstr(line, "~") == NULL) {
 			char path[STR_PATH_SIZE];
diff --git a/src/base/arenaFile.h b/src/base/arenaFile.h
index b4ca92b..4f1cdc5 100644
--- a/src/base/arenaFile.h
+++ b/src/base/arenaFile.h
@@ -21,8 +21,11 @@ extern char *getArenaName(arenaFile_t *arenaFile);
 extern char *getArenaNetName(arenaFile_t *arenaFile);
 extern arenaFile_t* getArenaFileFormNetName(char *s);
 extern char *getArenaImage(arenaFile_t *arenaFile);
+#ifndef PUBLIC_SERVER
 extern image_t* loadImageFromArena(arenaFile_t *arenaFile, char *filename, char *group, char *name, int alpha);
+#endif
 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 initArenaFile();
diff --git a/src/base/main.c b/src/base/main.c
index 62f433a..18ff5f3 100644
--- a/src/base/main.c
+++ b/src/base/main.c
@@ -112,6 +112,22 @@ int tryExistFile (const char *s)
 		return 0;
 }
 
+int isFillPath(const char *path)
+{
+	assert( path != NULL);
+
+#ifndef __WIN32__
+	if( path[0] == '/' ) // for Unix-like systems ;)
+#else
+	if( path[1] == ':' ) // for Windows-like systems ;)
+#endif
+	{
+		return 1;
+	}
+	
+	return 0;
+}
+
 #ifdef __WIN32__
 int WINAPI WinMain(
     HINSTANCE hInstance,
diff --git a/src/base/main.h b/src/base/main.h
index b50e56c..3555550 100644
--- a/src/base/main.h
+++ b/src/base/main.h
@@ -22,6 +22,7 @@
 	extern bool_t isParamFlag(char *s);
 	extern char *getString(int n);
 	extern int* newInt(int x);
+	extern int isFillPath(const char *path);
 	extern void accessExistFile(const char *s);
 	extern int tryExistFile (const char *s);
 #endif
diff --git a/src/base/proto.c b/src/base/proto.c
index 9c9163e..5097146 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -228,8 +228,7 @@ void proto_send_status_server(int type, client_t *client)
 	clients = getCurrentArena()->spaceTux->listIndex->count;
 	maxclients = getServerMaxClients();
 	uptime = (unsigned int)getUpdateServer();
-	//arena = getArenaNetName( getChoiceArenaId() );
-	//TODO
+	arena = getArenaNetName( getChoiceArena() );
 
 	snprintf(msg, STR_PROTO_SIZE,
 		"name: %s\n"
@@ -347,12 +346,10 @@ void proto_send_init_server(int type, client_t *client, client_t *client2)
 #endif
 
 	check_id = getNewIDcount(0);
-/*	
+	
 	snprintf(msg, STR_PROTO_SIZE, "init %d %d %d %d %s %d\n",
 		client2->tux->id, client2->tux->x, client2->tux->y,
-		count, getArenaNetName( getChoiceArenaId() ), check_id);
-*/
-	//TODO
+		count, getArenaNetName( getChoiceArena() ), check_id);
 	
 	//proto_send(type, client, msg);
 	protoSendClient(type, client, msg, CHECK_FRONT_TYPE_CHECK, check_id);
@@ -388,10 +385,9 @@ void proto_recv_init_client(char *msg)
 		return;
 	}
 
-	//setWorldArena( getArenaIdFormNetName(arena_name) );
-	//TODO
-	arena = getCurrentArena();
+	setWorldArena( getArenaFileFormNetName(arena_name) );
 
+	arena = getCurrentArena();
 	arena->max_countRound = n;
 
 	tux = newTux();
diff --git a/src/base/textFile.c b/src/base/textFile.c
index b7668ef..48e5044 100755
--- a/src/base/textFile.c
+++ b/src/base/textFile.c
@@ -14,11 +14,8 @@ textFile_t* newTextFile(char *s)
 	textFile_t *new;
 	char path[STR_PATH_SIZE];
 	assert( s != NULL );
-#ifndef __WIN32__
-	if( s[0] == '/' )
-#else
-	if( s[1] == ':' )
-#endif
+
+	if( isFillPath(s) )
 	{
 		strcpy(path, s);
 	}
@@ -28,6 +25,7 @@ textFile_t* newTextFile(char *s)
 		strcat(path, "/");
 		strcat(path, s);
 	}
+
 	new = malloc(sizeof(textFile_t));
 	new->file = strdup(path);
 	new->text = newList();