[Tux4kids-commits] Commit message hung up r1467

[Matthew Trey]

I made a small commit but it appears my commit message got hung up awaiting
list moderator approval, I've added my alioth account name to the list so it
should not happen again.

 

 

------LOG

simplified cascade.xml and laser.xml for now

removed a for loop in practice.c that was causing laser game instructions to
hang

included cascade.xml and laser.xml back into the build

made scripting background image scale properly when in fullscreen

turned instructions back on in titlescreen.c

(there actually isn't a button for laser instructions right now, but I
imagine

that the menu shouldn't be messed with until the GSoC branch is merged?)

 

-------DIFF

@@ -965,13 +959,39 @@

     if (curPage->background)

     {

       SDL_Surface* img = LoadImage(curPage->background,
IMG_ALPHA|IMG_NOT_REQUIRED);

-      SDL_BlitSurface(img, NULL, screen, NULL);

+

+      /* hack: since this is the background it needs to scale when in
fullscreen

+       * but shouldn't every image scale when in fullscreen? assuming svg
is for that... -MDT */

+      if (settings.fullscreen)

+      {

+        SDL_Surface* fsimg = zoom(img, fs_res_x, fs_res_y);

+        SDL_BlitSurface(fsimg, NULL, screen, NULL);

+        SDL_FreeSurface(fsimg);

+      }

+      else

+      {

+        SDL_BlitSurface(img, NULL, screen, NULL);

+      }

+

       SDL_FreeSurface(img);

+

     }

     else if (curScript->background)

     {

       SDL_Surface* img = LoadImage(curScript->background,
IMG_ALPHA|IMG_NOT_REQUIRED);

-      SDL_BlitSurface(img, NULL, screen, NULL);

+

+      /* hack: since this is the background it needs to scale when in
fullscreen -MDT */

+      if (settings.fullscreen)

+      {

+        SDL_Surface* fsimg = zoom(img, fs_res_x, fs_res_y);

+        SDL_BlitSurface(fsimg, NULL, screen, NULL);

+        SDL_FreeSurface(fsimg);

+      }

+      else

+      {

+        SDL_BlitSurface(img, NULL, screen, NULL);

+      }

+

       SDL_FreeSurface(img);

     }

 

Index: trunk/data/scripts/cascade.xml

===================================================================

--- trunk/data/scripts/cascade.xml  (revision 0)

+++ trunk/data/scripts/cascade.xml  (revision 0)

@@ -0,0 +1,18 @@

+<script title="Fish Cascade Instructions">

+  <page>

+    <img src="lessons_bkg.png" x="0" y="0">

+    <img src="main_bkg.png" x="0" y="0">

+    <img src="tux/stand-.png" x="100" y="330">

+    <text color="#FFFFFF" align="center" size="32">Help Tux Eat
Fish!</text>

+    <text color="#FFFFFF" align="center">Tux is very hungry! Eating</text>

+    <text color="#FFFFFF" align="center">fish with  letters gives
him</text>

+    <text color="#FFFFFF" align="center">a  tummy  ache.  Help  Tux</text>

+    <text color="#FFFFFF" align="center">eat   fish  by  pressing
the</text>

+    <text color="#FFFFFF" align="center">letters  on the  fish
making</text>

+    <text color="#FFFFFF" align="center">them  go  away  so he  can</text>

+    <text color="#FFFFFF" align="center">eat them all!</text>

+    <text></text>

+    <text color="#ffffff" align="center" size="22">Press Space to
Continue!</text>

+  </page>

+   <waitforinput/>

+  </page></lesson>

Index: trunk/data/scripts/laser.xml

===================================================================

--- trunk/data/scripts/laser.xml    (revision 0)

+++ trunk/data/scripts/laser.xml    (revision 0)

@@ -0,0 +1,18 @@

+<script title="Comet Zap Instructions" background="main_bkg.jpg">

+  <page>

+  <img src="main_bkg.png" x="0" y="0">

+  <text align="center" size="28">Save The Cities From Falling
Comets!</text>

+    <text align="center"t>Help Tux aim his laser beam by typing</text>

+    <text align="center">the letters on the comets.  Type quickly,</text>

+    <text align="center">because if Tux can't destroy the comets</text>

+    <text align="center"t>before they hit the ground, the cities'</text>

+    <text align="center"t>shield will be destroyed.  If they get hit</text>

+    <text align="center">again, the cities themselves will be</text>

+    <text align="center">destroyed!  Lose all of your cities</text>

+    <text align="center">and the game is over.</text>

+    <text></text>

+    <text align="center" color="#ffffff" size="22">Press Space to
Continue!</text>

+  </page>

+  <waitforinput/>

+</page>

+</lesson>

\ No newline at end of file

 

Property changes on: trunk/data/scripts/laser.xml

___________________________________________________________________

Added: svn:executable

   + *

 

Index: trunk/data/scripts/Makefile.am

===================================================================

--- trunk/data/scripts/Makefile.am  (revision 1466)

+++ trunk/data/scripts/Makefile.am  (working copy)

@@ -4,8 +4,7 @@

 scriptsdir = $(pkgdatadir)/scripts

 

 dist_scripts_DATA = projectInfo.xml \

-  Lesson_1.xml

+  Lesson_1.xml \

+  cascade.xml \

+  laser.xml

 

-## NOTE put these back in if we write them into a usable state

-##  cascade.xml \

-##  laser.xml

\ No newline at end of file

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/tux4kids-commits/attachments/20090830/0c67f057/attachment.htm>