[Tux4kids-commits] r659 - in tuxmath/trunk: data/missions/campaign/cadet src

[cheezmeister-guest at alioth.debian.org]

Author: cheezmeister-guest
Date: 2008-08-19 19:59:10 +0000 (Tue, 19 Aug 2008)
New Revision: 659

Modified:
   tuxmath/trunk/data/missions/campaign/cadet/round3
   tuxmath/trunk/src/campaign.c
   tuxmath/trunk/src/campaign.h
   tuxmath/trunk/src/multiplayer.c
Log:
Removed bonus rounds from campaign and fixed the "bug" disallowing exit 
by escape. Also stabilized multiplayer winner screen slightly.


Modified: tuxmath/trunk/data/missions/campaign/cadet/round3
===================================================================
--- tuxmath/trunk/data/missions/campaign/cadet/round3	2008-08-19 19:40:41 UTC (rev 658)
+++ tuxmath/trunk/data/missions/campaign/cadet/round3	2008-08-19 19:59:10 UTC (rev 659)
@@ -1,8 +1,6 @@
 #cadet round 3
 
-typing_practice_allowed = 1
-min_typing_num = 0
-max_typing_num = 100
+typing_practice_allowed = 0
 min_augend = 0
 max_augend = 20
 min_augend = 0

Modified: tuxmath/trunk/src/campaign.c
===================================================================
--- tuxmath/trunk/src/campaign.c	2008-08-19 19:40:41 UTC (rev 658)
+++ tuxmath/trunk/src/campaign.c	2008-08-19 19:59:10 UTC (rev 659)
@@ -89,11 +89,12 @@
       showGameWon();
       break;
     }
-    //bonus round
+/*    //bonus round
     readStageSettings(i);
     readRoundSettings(i, -1);
     game_set_start_message("Bonus", "", "", "");
-    game();
+    game();
+*/
   }
   scroll_text(endtext, screen->clip_rect, 3);
   return 0;

Modified: tuxmath/trunk/src/campaign.h
===================================================================
--- tuxmath/trunk/src/campaign.h	2008-08-19 19:40:41 UTC (rev 658)
+++ tuxmath/trunk/src/campaign.h	2008-08-19 19:59:10 UTC (rev 659)
@@ -8,8 +8,9 @@
  */
  
 #include "SDL_extras.h"
+
 
-#define TESTING_CAMPAIGN
+//#define TESTING_CAMPAIGN //allow ESC to skip missions instead of exiting
 
 #define NUM_STAGES 5 
 #define NUM_ROUNDS 3

Modified: tuxmath/trunk/src/multiplayer.c
===================================================================
--- tuxmath/trunk/src/multiplayer.c	2008-08-19 19:40:41 UTC (rev 658)
+++ tuxmath/trunk/src/multiplayer.c	2008-08-19 19:59:10 UTC (rev 659)
@@ -160,7 +160,7 @@
   return params[param];
 }
 
-
+//TODO a nicer-looking sequence that also recognizes second place etc.
 void showWinners(int* winners, int num)
 {
   int skip = 0;
@@ -170,9 +170,11 @@
   SDL_Rect center = box;
   SDL_Event evt;
 
+  const char* winnername = (winners[0] == -1 ? "Nobody" : pnames[winners[0]] );
+  
   tmdprintf(pnames[winners[0]] );
   tmdprintf("%d\n", snprintf(text, HIGH_SCORE_NAME_LENGTH + strlen(" wins!"),
-                    "%s wins!", pnames[winners[0]]) );
+                    "%s wins!", winnername) );
   tmdprintf("Win text: %s\n", text);
 
   DarkenScreen(1);