- 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

4 files changed, 12 insertions, 16 deletions

diff --git a/src/screen/screen_choiceArena.c b/src/screen/screen_choiceArena.c
index ca14c0c..b12b8ec 100644
--- a/src/screen/screen_choiceArena.c
+++ b/src/screen/screen_choiceArena.c
@@ -99,23 +99,20 @@ static void eventWidgetButtonImage(void *p)
 	}
 }
 
-arenaFile_t* getChoiceArenaId()
+arenaFile_t* getChoiceArena()
 {
 	return currentArena;
 }
 
-void setChoiceArenaId(int n)
+void setChoiceArena(arenaFile_t *arenaFile)
 {
 	widget_t *widget_buttonimage;
+	int id;
 
-	if( n < 0 )
-	{
-		return;
-	}
-
-	currentArena = getArenaFile(n);
+	id = getArenaFileID(arenaFile);
+	currentArena = arenaFile;
 
-	widget_buttonimage = (widget_t *)listWidgetButtonimage->list[n];
+	widget_buttonimage = (widget_t *)listWidgetButtonimage->list[id];
 	setWidgetButtonimageActive(widget_buttonimage, TRUE);
 }
 
diff --git a/src/screen/screen_choiceArena.h b/src/screen/screen_choiceArena.h
index 1e38ee8..8ff3a0c 100644
--- a/src/screen/screen_choiceArena.h
+++ b/src/screen/screen_choiceArena.h
@@ -11,8 +11,8 @@
 
 extern void drawScreenChoiceArena();
 extern void eventScreenChoiceArena();
-extern arenaFile_t* getChoiceArenaId();
-extern void setChoiceArenaId(int n);
+extern arenaFile_t* getChoiceArena();
+extern void setChoiceArena(arenaFile_t *arenaFile);
 extern void initScreenChoiceArena();
 extern void quitScreenChoiceArena();
 
diff --git a/src/screen/screen_setting.c b/src/screen/screen_setting.c
index 229d34d..c79acaf 100644
--- a/src/screen/screen_setting.c
+++ b/src/screen/screen_setting.c
@@ -281,8 +281,7 @@ static void initSettingFile()
 #endif
 
 	loadValueFromConfigFile(configFile, "ARENA", val, STR_SIZE, "FAGN");
-	//setChoiceArenaId( getArenaIdFormNetName(val) );
-	//TODO
+	setChoiceArena( getArenaFileFormNetName(val) );
 
 	saveTextFile(configFile);
 }
@@ -321,7 +320,7 @@ static void saveAndDestroyConfigFile()
 	setValueInConfigFile(configFile, "SOUND", getYesOrNo(getWidgetCheckStatus(check_sound)));
 #endif
 
-	//setValueInConfigFile(configFile, "ARENA", getArenaNetName(getChoiceArenaId()));
+	setValueInConfigFile(configFile, "ARENA", getArenaNetName(getChoiceArena()));
 	//TODO
 
 	saveTextFile(configFile);
diff --git a/src/screen/screen_world.c b/src/screen/screen_world.c
index d6febf7..36ccddb 100644
--- a/src/screen/screen_world.c
+++ b/src/screen/screen_world.c
@@ -134,7 +134,7 @@ void prepareArena()
 	switch( getNetTypeGame() )
 	{
 		case NET_GAME_TYPE_NONE :
-			setWorldArena( getChoiceArenaId() );
+			setWorldArena( getChoiceArena() );
 			addNewItem(arena->spaceItem, ID_UNKNOWN);
 			getSettingCountRound(&arena->max_countRound);
 
@@ -165,7 +165,7 @@ void prepareArena()
 		break;
 
 		case NET_GAME_TYPE_SERVER :
-			setWorldArena( getChoiceArenaId() );
+			setWorldArena( getChoiceArena() );
 			addNewItem(arena->spaceItem, ID_UNKNOWN);
 			getSettingCountRound(&arena->max_countRound);