[Tux4kids-commits] r846 - in tuxmath/trunk: data/images/sprites src

[dbruce-guest at alioth.debian.org]

Author: dbruce-guest
Date: 2009-01-14 21:55:31 +0000 (Wed, 14 Jan 2009)
New Revision: 846

Added:
   tuxmath/trunk/data/images/sprites/factors0.png
   tuxmath/trunk/data/images/sprites/factors1.png
   tuxmath/trunk/data/images/sprites/factors2.png
   tuxmath/trunk/data/images/sprites/factors3.png
   tuxmath/trunk/data/images/sprites/factors4.png
   tuxmath/trunk/data/images/sprites/factors5.png
   tuxmath/trunk/data/images/sprites/factorsd.png
Modified:
   tuxmath/trunk/data/images/sprites/Makefile.am
   tuxmath/trunk/src/SDL_extras.c
   tuxmath/trunk/src/titlescreen.c
Log:
new factors icon



Modified: tuxmath/trunk/data/images/sprites/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.am	2009-01-14 16:44:47 UTC (rev 845)
+++ tuxmath/trunk/data/images/sprites/Makefile.am	2009-01-14 21:55:31 UTC (rev 846)
@@ -22,6 +22,13 @@
   factoroids1.png \
   factoroids2.png \
   factoroidsd.png \
+  factors0.png \
+  factors1.png \
+  factors2.png \
+  factors3.png \
+  factors4.png \
+  factors5.png \
+  factorsd.png \
   fleet0.png \
   fleetd.png \
   goldstard.png \

Added: tuxmath/trunk/data/images/sprites/factors0.png
===================================================================
(Binary files differ)


Property changes on: tuxmath/trunk/data/images/sprites/factors0.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tuxmath/trunk/data/images/sprites/factors1.png
===================================================================
(Binary files differ)


Property changes on: tuxmath/trunk/data/images/sprites/factors1.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tuxmath/trunk/data/images/sprites/factors2.png
===================================================================
(Binary files differ)


Property changes on: tuxmath/trunk/data/images/sprites/factors2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tuxmath/trunk/data/images/sprites/factors3.png
===================================================================
(Binary files differ)


Property changes on: tuxmath/trunk/data/images/sprites/factors3.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tuxmath/trunk/data/images/sprites/factors4.png
===================================================================
(Binary files differ)


Property changes on: tuxmath/trunk/data/images/sprites/factors4.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tuxmath/trunk/data/images/sprites/factors5.png
===================================================================
(Binary files differ)


Property changes on: tuxmath/trunk/data/images/sprites/factors5.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tuxmath/trunk/data/images/sprites/factorsd.png
===================================================================
(Binary files differ)


Property changes on: tuxmath/trunk/data/images/sprites/factorsd.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tuxmath/trunk/src/SDL_extras.c
===================================================================
--- tuxmath/trunk/src/SDL_extras.c	2009-01-14 16:44:47 UTC (rev 845)
+++ tuxmath/trunk/src/SDL_extras.c	2009-01-14 21:55:31 UTC (rev 846)
@@ -379,6 +379,12 @@
     return NULL;
   }
 
+  if (t[0] == '\0')
+  {
+    fprintf(stderr, "BlackOutline(): empty string, returning");
+    return NULL;
+  }
+
 #ifdef TUXMATH_DEBUG
   fprintf( stderr, "\nEntering BlackOutline(): \n");
   fprintf( stderr, "BlackOutline of \"%s\"\n", t );

Modified: tuxmath/trunk/src/titlescreen.c
===================================================================
--- tuxmath/trunk/src/titlescreen.c	2009-01-14 16:44:47 UTC (rev 845)
+++ tuxmath/trunk/src/titlescreen.c	2009-01-14 21:55:31 UTC (rev 846)
@@ -89,6 +89,8 @@
   SPRITE_ALONE,
   SPRITE_FRIENDS,
   SPRITE_FACTOROIDS,
+  SPRITE_FACTORS,
+  SPRITE_FRACTIONS,
   SPRITE_CAMPAIGN,
   SPRITE_SSWEEP,
   SPRITE_ELIMINATION,
@@ -115,6 +117,8 @@
   "alone", 
   "friends", 
   "factoroids",
+  "factors",
+  "factors",  //change this when "fractions" sprite made - DSB
   "fleet",
   "nums",
   "exclamation"
@@ -993,8 +997,8 @@
   int choice,hs_table;
 
   // Set up the sprites
-  sprites[0] = sprite_list[SPRITE_CADET];
-  sprites[1] = sprite_list[SPRITE_SCOUT];
+  sprites[0] = sprite_list[SPRITE_FACTORS];
+  sprites[1] = sprite_list[SPRITE_FRACTIONS];
   sprites[2] = sprite_list[SPRITE_MAIN];
 
   set_default_menu_options(&menu_opts);