[Tux4kids-commits] r1659 - in tuxtype/trunk: data/images src

[David Bruce]

Author: dbruce-guest
Date: 2009-11-19 19:34:26 +0000 (Thu, 19 Nov 2009)
New Revision: 1659

Modified:
   tuxtype/trunk/data/images/fishy0.png
   tuxtype/trunk/data/images/fishy1.png
   tuxtype/trunk/data/images/fishy2.png
   tuxtype/trunk/data/images/fishy3.png
   tuxtype/trunk/data/images/num_0.png
   tuxtype/trunk/data/images/num_1.png
   tuxtype/trunk/data/images/num_2.png
   tuxtype/trunk/data/images/num_3.png
   tuxtype/trunk/data/images/num_4.png
   tuxtype/trunk/data/images/num_5.png
   tuxtype/trunk/data/images/num_6.png
   tuxtype/trunk/data/images/num_7.png
   tuxtype/trunk/data/images/num_8.png
   tuxtype/trunk/data/images/num_9.png
   tuxtype/trunk/data/images/splat0.png
   tuxtype/trunk/src/playgame.c
   tuxtype/trunk/src/practice.c
Log:
changed code and several of images to use IMG_ALPHA instead of IMG_COLORKEY because latter seems to not work in newest SDL_image on Mac

Modified: tuxtype/trunk/data/images/fishy0.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/fishy1.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/fishy2.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/fishy3.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/num_0.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/num_1.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/num_2.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/num_3.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/num_4.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/num_5.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/num_6.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/num_7.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/num_8.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/num_9.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/data/images/splat0.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/src/playgame.c
===================================================================
--- tuxtype/trunk/src/playgame.c	2009-11-19 19:25:10 UTC (rev 1658)
+++ tuxtype/trunk/src/playgame.c	2009-11-19 19:34:26 UTC (rev 1659)
@@ -635,7 +635,7 @@
 	number_max_w = 0;
 	for (i = 0; i < NUM_NUMS; i++) {
 		sprintf(filename, "num_%i.png", i);
-		number[i] = LoadImage( filename, IMG_COLORKEY );
+		number[i] = LoadImage( filename, IMG_ALPHA );
 		if (number[i]->w > number_max_w)
 			number_max_w = number[i]->w;
 	}
@@ -706,8 +706,8 @@
 
 	LOG( "=LoadFishies()\n" );
 
-	fish_sprite = LoadSprite( "fishy", IMG_COLORKEY );
-	splat_sprite = LoadSprite( "splat", IMG_COLORKEY );
+	fish_sprite = LoadSprite( "fishy", IMG_ALPHA );
+	splat_sprite = LoadSprite( "splat", IMG_ALPHA );
 
 	for (i = 0; i < MAX_FISHIES_HARD; i++) {
 		fish_object[i].alive = 1;
@@ -729,7 +729,7 @@
 	LOG( "=LoadTuxAnims(): Loading Tux Animations\n" );
 
 	for ( i=0; i < TUX_NUM_STATES; i++ ) {
-		tux_object.spr[i][RIGHT] = LoadSprite( tux_sprite_fns[i], IMG_COLORKEY ); 
+		tux_object.spr[i][RIGHT] = LoadSprite( tux_sprite_fns[i], IMG_ALPHA ); 
 		tux_object.spr[i][LEFT] = FlipSprite( tux_object.spr[i][RIGHT], 1, 0 ); 
 	}
 

Modified: tuxtype/trunk/src/practice.c
===================================================================
--- tuxtype/trunk/src/practice.c	2009-11-19 19:25:10 UTC (rev 1658)
+++ tuxtype/trunk/src/practice.c	2009-11-19 19:34:26 UTC (rev 1659)
@@ -874,8 +874,8 @@
   }
 
   /* load tux sprites: */
-  tux_win = LoadSprite("tux/win", IMG_COLORKEY);
-  tux_stand = LoadSprite("tux/stand", IMG_COLORKEY);
+  tux_win = LoadSprite("tux/win", IMG_ALPHA);
+  tux_stand = LoadSprite("tux/stand", IMG_ALPHA);
   /* load needed sounds: */
   wrong = LoadSound("buzz.wav");
   cheer = LoadSound("cheer.wav");