[Tux4kids-commits] r585 - in tuxmath/branches/factroids: data/images data/images/factroids src

[fongog-guest at alioth.debian.org]

Author: fongog-guest
Date: 2008-08-05 06:30:12 +0000 (Tue, 05 Aug 2008)
New Revision: 585

Added:
   tuxmath/branches/factroids/data/images/factroids/factoroids.png
   tuxmath/branches/factroids/data/images/factroids/factors.png
Modified:
   tuxmath/branches/factroids/data/images/Makefile.am
   tuxmath/branches/factroids/data/images/factroids/Makefile
   tuxmath/branches/factroids/data/images/factroids/Makefile.am
   tuxmath/branches/factroids/data/images/factroids/Makefile.in
   tuxmath/branches/factroids/data/images/factroids/gbstars.png
   tuxmath/branches/factroids/src/factroids.c
   tuxmath/branches/factroids/src/fileops.c
   tuxmath/branches/factroids/src/fileops.h
Log:
Add: The intro imagen of the two activities, and a background improvement 
Fix: Background size... ( not definitive! )


Modified: tuxmath/branches/factroids/data/images/Makefile.am
===================================================================
--- tuxmath/branches/factroids/data/images/Makefile.am	2008-08-04 12:20:22 UTC (rev 584)
+++ tuxmath/branches/factroids/data/images/Makefile.am	2008-08-05 06:30:12 UTC (rev 585)
@@ -4,6 +4,7 @@
 SUBDIRS = backgrounds \
   cities \
   comets \
+  factroids \
   icons \
   igloos \
   penguins \

Modified: tuxmath/branches/factroids/data/images/factroids/Makefile
===================================================================
--- tuxmath/branches/factroids/data/images/factroids/Makefile	2008-08-04 12:20:22 UTC (rev 584)
+++ tuxmath/branches/factroids/data/images/factroids/Makefile	2008-08-05 06:30:12 UTC (rev 585)
@@ -246,7 +246,9 @@
 		 ship05.png 	 \
 		 ship09.png 	 \
 		 ship.png	 \
-		 star3.png	 
+		 star3.png	 \
+		 factoroids.png  \
+		 factors.png
 
 all: all-am
 

Modified: tuxmath/branches/factroids/data/images/factroids/Makefile.am
===================================================================
--- tuxmath/branches/factroids/data/images/factroids/Makefile.am	2008-08-04 12:20:22 UTC (rev 584)
+++ tuxmath/branches/factroids/data/images/factroids/Makefile.am	2008-08-05 06:30:12 UTC (rev 585)
@@ -27,9 +27,10 @@
 		 ship05.png 	 \
 		 ship09.png 	 \
 		 ship.png	 \
-		 star3.png	 
+		 star3.png	 \
+		 factoroids.png  \
+		 factors.png
 
 
 
 
-

Modified: tuxmath/branches/factroids/data/images/factroids/Makefile.in
===================================================================
--- tuxmath/branches/factroids/data/images/factroids/Makefile.in	2008-08-04 12:20:22 UTC (rev 584)
+++ tuxmath/branches/factroids/data/images/factroids/Makefile.in	2008-08-05 06:30:12 UTC (rev 585)
@@ -246,7 +246,9 @@
 		 ship05.png 	 \
 		 ship09.png 	 \
 		 ship.png	 \
-		 star3.png	 
+		 star3.png	 \
+		 factoroids.png  \
+		 factors.png
 
 all: all-am
 

Added: tuxmath/branches/factroids/data/images/factroids/factoroids.png
===================================================================
(Binary files differ)


Property changes on: tuxmath/branches/factroids/data/images/factroids/factoroids.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tuxmath/branches/factroids/data/images/factroids/factors.png
===================================================================
(Binary files differ)


Property changes on: tuxmath/branches/factroids/data/images/factroids/factors.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tuxmath/branches/factroids/data/images/factroids/gbstars.png
===================================================================
(Binary files differ)

Modified: tuxmath/branches/factroids/src/factroids.c
===================================================================
--- tuxmath/branches/factroids/src/factroids.c	2008-08-04 12:20:22 UTC (rev 584)
+++ tuxmath/branches/factroids/src/factroids.c	2008-08-05 06:30:12 UTC (rev 585)
@@ -407,6 +407,9 @@
   FF_draw_bkgr();
   if(FF_game==FACTOROIDS_GAME)
   {
+    rect.x=(screen->w/2)-(images[IMG_FACTOROIDS]->w/2);
+    rect.y=(screen->h)/7;
+    SDL_BlitSurface(images[IMG_FACTOROIDS],NULL,screen,&rect);
     FF_ShowMessage(_("FACTOROIDS: to win, you need destroy all the asteroids."),
 		   _("Use the arrow keys to turn or go forward.  Aim at an asteroid,"),
 		   _("type one of its factors, and press space or return..."),
@@ -414,6 +417,9 @@
   }
   else if (FF_game==FRACTIONS_GAME)
   {
+    rect.x=(screen->w/2)-(images[IMG_FACTORS]->w/2);
+    rect.y=(screen->h)/7;
+    SDL_BlitSurface(images[IMG_FACTORS],NULL,screen,&rect);
     FF_ShowMessage(_("THE FRACTION ACTIVIY"),
 		   _("To win, you need destroy all the asteroids finding a number that"),
 		   _("can simplify the fraction... The rocks will split until you got all"),

Modified: tuxmath/branches/factroids/src/fileops.c
===================================================================
--- tuxmath/branches/factroids/src/fileops.c	2008-08-04 12:20:22 UTC (rev 584)
+++ tuxmath/branches/factroids/src/fileops.c	2008-08-05 06:30:12 UTC (rev 585)
@@ -3004,7 +3004,9 @@
   DATA_PREFIX "/images/factroids/ship09.png",
   DATA_PREFIX "/images/factroids/ship10.png",
   DATA_PREFIX "/images/factroids/ship11.png",
-  DATA_PREFIX "/images/factroids/ship12.png"
+  DATA_PREFIX "/images/factroids/ship12.png",
+  DATA_PREFIX "/images/factroids/factoroids.png",
+  DATA_PREFIX "/images/factroids/factors.png"
   };
 
   /* Load images: */

Modified: tuxmath/branches/factroids/src/fileops.h
===================================================================
--- tuxmath/branches/factroids/src/fileops.h	2008-08-04 12:20:22 UTC (rev 584)
+++ tuxmath/branches/factroids/src/fileops.h	2008-08-05 06:30:12 UTC (rev 585)
@@ -201,6 +201,8 @@
   IMG_SHIP10,
   IMG_SHIP11,
   IMG_SHIP12,
+  IMG_FACTOROIDS,
+  IMG_FACTORS,
   NUM_IMAGES
 };