- opravene regresnie, kotre vznikli, pri prepise naciatavania aren z *.zip

  ( a odstranene prebytocne subory z adresarovej struktury -- tie ktore su uz zabalene v zip )



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

2 files changed, 6 insertions, 9 deletions

diff --git a/src/client/image.c b/src/client/image.c
index 86f80af..4c4010c 100755
--- a/src/client/image.c
+++ b/src/client/image.c
@@ -40,13 +40,13 @@ static SDL_Surface *loadImage(const char *filename, int alpha)
 	char str[STR_PATH_SIZE];
 
 
-	if( filename[0] != '/' )
+	if( isFillPath(filename) )
 	{
-		sprintf(str, PATH_IMAGE "%s", filename);
+		strcpy(str, filename);
 	}
 	else
 	{
-		strcpy(str, filename);
+		sprintf(str, PATH_IMAGE "%s", filename);
 	}
 
 	accessExistFile(str);
diff --git a/src/client/saveLoad.c b/src/client/saveLoad.c
index 15ad143..be7933b 100644
--- a/src/client/saveLoad.c
+++ b/src/client/saveLoad.c
@@ -59,13 +59,11 @@ static void action_saveItem(space_t *space, item_t *item, textFile_t *textFile)
 static void saveContextArenaToTextFile(textFile_t *textFile, arena_t *arena)
 {
 	char str[STR_PROTO_SIZE];
-/*
+
 	sprintf(str, "ARENA %s %d %d",
-		getArenaNetName(getChoiceArenaId()),
+		getArenaNetName(getChoiceArena()),
 		arena->countRound,
 		arena->max_countRound);
-*/
-	//TODO
 
 	addList(textFile->text, strdup(str));
 
@@ -107,8 +105,7 @@ static arena_t* loadArenaFromLine(char *line)
 
 	sscanf(line, "%s %s %d %d", cmd, name, &countRound, &max_countRound);
 
-	//setWorldArena( getArenaIdFormNetName(name) );
-	//TODO
+	setWorldArena( getArenaFileFormNetName(name) );
 
 	arena = getCurrentArena();
 	arena->max_countRound = max_countRound;