- opravena chyba, tux mophol pomocou bombballu vybuchnuteho v objekte do ktoreho sa dostal ako duch pridavat itemy

- kod namiesto SDL_Surface pouziva moj typ image_t



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

9 files changed, 15 insertions, 13 deletions

diff --git a/src/screen/screen_analyze.c b/src/screen/screen_analyze.c
index 9299c7b..7723f94 100644
--- a/src/screen/screen_analyze.c
+++ b/src/screen/screen_analyze.c
@@ -147,7 +147,7 @@ void endAnalyze()
 
 void initScreenAnalyze()
 {
-	SDL_Surface *image;
+	image_t *image;
 
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
 	image_backgorund  = newWidgetImage(0, 0, image);
diff --git a/src/screen/screen_browser.c b/src/screen/screen_browser.c
index 17a05b6..3130dd4 100644
--- a/src/screen/screen_browser.c
+++ b/src/screen/screen_browser.c
@@ -676,7 +676,7 @@ static int RefreshServers ()
 
 void initScreenBrowser()
 {
-	SDL_Surface *image;
+	image_t *image;
 
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
 	image_backgorund  = newWidgetImage(0, 0, image);
diff --git a/src/screen/screen_choiceArena.c b/src/screen/screen_choiceArena.c
index cd61c9c..f1a13b3 100644
--- a/src/screen/screen_choiceArena.c
+++ b/src/screen/screen_choiceArena.c
@@ -123,7 +123,7 @@ static void eventWidget(void *p)
 
 void initScreenChoiceArena()
 {
-	SDL_Surface *image;
+	image_t *image;
 	int i;
 
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
@@ -137,7 +137,6 @@ void initScreenChoiceArena()
 
 	for( i = 0 ; i < getArenaCount() ; i++ )
 	{
-		SDL_Surface *image;
 		widget_buttonimage_t *widget_buttonimage;
 		int x, y;
 
diff --git a/src/screen/screen_credits.c b/src/screen/screen_credits.c
index 6de034a..8bbd433 100644
--- a/src/screen/screen_credits.c
+++ b/src/screen/screen_credits.c
@@ -96,7 +96,7 @@ static void eventWidget(void *p)
 
 void initScreenCredits()
 {
-	SDL_Surface *image;
+	image_t *image;
 	int i;
 
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
diff --git a/src/screen/screen_gameType.c b/src/screen/screen_gameType.c
index fb971db..bafa747 100644
--- a/src/screen/screen_gameType.c
+++ b/src/screen/screen_gameType.c
@@ -170,7 +170,7 @@ static void eventWidget(void *p)
 
 void initScreenGameType()
 {
-	SDL_Surface *image;
+	image_t *image;
 
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
 	image_backgorund  = newWidgetImage(0, 0, image);
diff --git a/src/screen/screen_mainMenu.c b/src/screen/screen_mainMenu.c
index 024d3bd..eb07cab 100644
--- a/src/screen/screen_mainMenu.c
+++ b/src/screen/screen_mainMenu.c
@@ -96,7 +96,7 @@ static void eventWidget(void *p)
 
 void initScreenMainMenu()
 {
-	SDL_Surface *image;
+	image_t *image;
 
 	image = addImageData("screen_main.png", IMAGE_NO_ALPHA, "screen_main", IMAGE_GROUP_BASE);
 	image_backgorund  = newWidgetImage(0, 0, image);
diff --git a/src/screen/screen_setting.c b/src/screen/screen_setting.c
index 876c464..350788d 100644
--- a/src/screen/screen_setting.c
+++ b/src/screen/screen_setting.c
@@ -313,7 +313,7 @@ static void saveAndDestroyConfigFile()
 
 void initScreenSetting()
 {
-	SDL_Surface *image;
+	image_t *image;
 	int i;
 
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
diff --git a/src/screen/screen_table.c b/src/screen/screen_table.c
index 498dc7a..1f53b8d 100644
--- a/src/screen/screen_table.c
+++ b/src/screen/screen_table.c
@@ -203,8 +203,7 @@ int addPlayerInHighScore(char *name, int score)
 
 void initScreenTable()
 {
-	SDL_Surface *image;
-
+	image_t *image;
 
 	image = addImageData("screen_table.png", IMAGE_NO_ALPHA, "screen_table", IMAGE_GROUP_BASE);
 	image_backgorund  = newWidgetImage(0, 0, image);
diff --git a/src/screen/screen_world.c b/src/screen/screen_world.c
index b770bd5..cbd5400 100644
--- a/src/screen/screen_world.c
+++ b/src/screen/screen_world.c
@@ -119,6 +119,7 @@ void countRoundInc()
 void prepareArena()
 {
 	tux_t *tux;
+	char name[STR_NAME_SIZE];
 
 	//printf("getSettingAI = %s\n", getSettingAI());
 	setCurrentArena(NULL);
@@ -133,13 +134,15 @@ void prepareArena()
 			tux = newTux();
 			tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
 			tuxWithControlRightKeyboard = tux;
-			getSettingNameRight(tux->name);
+			getSettingNameRight(name);
+			tuxSetName(tux, name);
 			addObjectToSpace(arena->spaceTux, tux);
 		
 			tux = newTux();
 			tux->control = TUX_CONTROL_KEYBOARD_LEFT;
 			tuxWithControlLeftKeyboard = tux;
-			getSettingNameLeft(tux->name);
+			getSettingNameLeft(name);
+			tuxSetName(tux, name);
 			addObjectToSpace(arena->spaceTux, tux);
 
 			if( isSettingAI() )
@@ -159,7 +162,8 @@ void prepareArena()
 			tux = newTux();
 			tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
 			tuxWithControlRightKeyboard = tux;
-			getSettingNameRight(tux->name);
+			getSettingNameRight(name);
+			tuxSetName(tux, name);
 			addObjectToSpace(arena->spaceTux, tux);
 		break;