[Tux4kids-commits] r300 - in tuxmath/trunk: docs src

[tholy-guest at alioth.debian.org]

Author: tholy-guest
Date: 2007-10-12 11:31:39 +0000 (Fri, 12 Oct 2007)
New Revision: 300

Modified:
   tuxmath/trunk/docs/changelog
   tuxmath/trunk/src/game.c
   tuxmath/trunk/src/titlescreen.c
Log:
Changed the text displayed with the "Project Info" menu item, and
(temporarily) removed the Settings menu entry.


Modified: tuxmath/trunk/docs/changelog
===================================================================
--- tuxmath/trunk/docs/changelog	2007-10-12 11:22:32 UTC (rev 299)
+++ tuxmath/trunk/docs/changelog	2007-10-12 11:31:39 UTC (rev 300)
@@ -1,3 +1,20 @@
+2007.Oct.12 (svn.debian.org/tux4kids - revision 298)
+  Options:
+      * Added material in "Project Info" and (temporarily) removed the
+	Settings menu.  This removes the last menu entries that result in
+	"Work In Progress."  The thought is that it will make the
+	application seem more polished to only have entries that do what
+	they advertise.  We can restore the Settings entry when the code is
+	ready.
+      Tim Holy <holy at wustl.edu>
+	
+
+2007.Oct.12 (svn.debian.org/tux4kids - revision 297)
+  Options:
+      * Redesigned the help to make it more interactive.
+      Tim Holy <holy at wustl.edu>
+	
+
 2007.Oct.10 (svn.debian.org/tux4kids - revision 294)
   Graphics:
       * Added a help menu sprite. The help screen will probably be

Modified: tuxmath/trunk/src/game.c
===================================================================
--- tuxmath/trunk/src/game.c	2007-10-12 11:22:32 UTC (rev 299)
+++ tuxmath/trunk/src/game.c	2007-10-12 11:31:39 UTC (rev 300)
@@ -845,14 +845,6 @@
   return (game_status != GAME_IN_PROGRESS);
 }
 
-int game_delay_and_exit(void)
-{
-  SDL_Delay(100);
-  game_handle_user_events();
-  game_status = check_exit_conditions();
-  return (game_status != GAME_IN_PROGRESS);
-}
-
 void help_add_comet(int a,int oper,int b,int c)
 {
   char probstr[MC_FORMULA_LEN];

Modified: tuxmath/trunk/src/titlescreen.c
===================================================================
--- tuxmath/trunk/src/titlescreen.c	2007-10-12 11:22:32 UTC (rev 299)
+++ tuxmath/trunk/src/titlescreen.c	2007-10-12 11:31:39 UTC (rev 300)
@@ -532,12 +532,14 @@
   }
   if (s3)
   {
-    loc.x = 320 - (s3->w/2); loc.y = 300;
+    //loc.x = 320 - (s3->w/2); loc.y = 300;
+    loc.x = 320 - (s3->w/2); loc.y = 110;
     SDL_BlitSurface( s3, NULL, screen, &loc);
   }
   if (s4)
   {
-    loc.x = 320 - (s4->w/2); loc.y = 340;
+    //loc.x = 320 - (s4->w/2); loc.y = 340;
+    loc.x = 320 - (s4->w/2); loc.y = 200;
     SDL_BlitSurface( s4, NULL, screen, &loc);
   }
 
@@ -786,6 +788,8 @@
 
 int run_options_menu(void)
 {
+  /*
+    // Use the following version if we get "Settings" implemented
   const unsigned char* menu_text[5] =
     {(const unsigned char*)N_("Settings"),
      (const unsigned char*)N_("Demo"),
@@ -794,25 +798,36 @@
      (const unsigned char*)N_("Main Menu")};
   sprite* sprites[5] =
     {NULL, NULL, NULL, NULL, NULL};
+  */
+  const unsigned char* menu_text[4] =
+    {(const unsigned char*)N_("Demo"),
+     (const unsigned char*)N_("Project Info"),
+     (const unsigned char*)N_("Credits"),
+     (const unsigned char*)N_("Main Menu")};
+  sprite* sprites[4] =
+    {NULL, NULL, NULL, NULL};
+  int n_menu_entries = 4;
   menu_options menu_opts;
   int choice;
 
   // Set up the sprites
-  sprites[4] = sprite_list[SPRITE_MAIN];
+  sprites[0] = sprite_list[SPRITE_ARCADE];
+  sprites[3] = sprite_list[SPRITE_MAIN];
 
   set_default_menu_options(&menu_opts);
   menu_opts.ytop = 100;
 
-  choice = choose_menu_item(menu_text,sprites,5,menu_opts);
+  choice = choose_menu_item(menu_text,sprites,n_menu_entries,menu_opts);
 
   while (choice >= 0) {
     switch (choice) {
+      /*
     case 0: {
       // Settings
       NotImplemented();
       break;
-    }
-    case 1: {
+      }*/
+    case 0: {
       // Demo
       if (read_named_config_file("demo"))
       {
@@ -827,6 +842,15 @@
 
       break;
     }
+    case 1: {
+      // Project Info
+      //NotImplemented();
+      ShowMessage(_("TuxMath is free and open-source!"),
+		  _("You can help make it better by reporting problems,"),
+		  _("suggesting improvements, or adding code."),
+		  _("Discuss the future at tuxmath-devel at lists.sourceforge.net"));
+      break;
+    }
     case 2: {
       // Credits
       //TitleScreen_unload_media();
@@ -835,18 +859,13 @@
       break;
     }
     case 3: {
-      // Project Info
-      NotImplemented();
-      break;
-    }
-    case 4: {
       // Main menu
       return 0;
     }
     }
 
     menu_opts.starting_entry = choice;
-    choice = choose_menu_item(menu_text,sprites,5,menu_opts);
+    choice = choose_menu_item(menu_text,sprites,n_menu_entries,menu_opts);
   }
 
   return 0;