Changeset 1390 for GTP

Timestamp:

09/17/06 00:06:54 (18 years ago)

Author:

giegl

Message:

GTPD - Jungle Rumble - F1 freezes gameplay

Location:

GTP/trunk/App/Games/Jungle_Rumble

Files:

• bin/JungleRumble.exe (modified) (previous)
• src/GameManager.cpp (modified) (1 diff)
• src/HUDRenderer.cpp (modified) (2 diffs)

GTP/trunk/App/Games/Jungle_Rumble/src/GameManager.cpp

@@ -107 +107 @@
                                                         
                                                         s += "\n F11 Opponent Fire On/Off\n Pause: Pause Game\n 1 Standard weapon\n 2 Bombs - explode late, but do cause lots of damage!\n 3 Alien weapon - just shoot!\n 4 Firethrower - Toast your opponent\n 5 Icethrower - Slow down your opponent";
-                                                        //s += "HELP:\n drive: w-a-s-d\n shoot: left mouse\n F2: show FPS\n F3: PhysX Debugger\n F4: Music On/Off\n F9: Depth Imposters On/Off\n F10: Raytracer On/Off\n F11 Opponent Fire On/Off\n Pause: Pause Game\n 1 Standard weapon\n 2 Bombs - explode late, but do cause lots of damage!\n 3 Alien weapon - just shoot!\n 4 Firethrower - Toast your opponent\n 5 Icethrower - Slow down your opponent";
                                                         this->gs.getHUD()->message(s, 2, 0.01f, true);
-                                                        //this->gs.useRaytracer
                                                 #elif(1) // MG
+                                                        // Toggle help with F1
                                                         GLOBAL_display_help_screenQ = !GLOBAL_display_help_screenQ;
+                                                        if(GLOBAL_display_help_screenQ) {
+                                                                this->gs.preparepaused = true;
+                                                        }
+                                                        else {
+                                                                this->gs.preparepaused= false;
+                                                                this->gs.currentlypaused = false;
+                                                                this->gs.getHUD()->message("", 1, 0.01f);
+                                                        }
                                                 #endif
                                         }
-                                        //this->gs.hasWon();
                                         break;
                                 case VK_F2:

GTP/trunk/App/Games/Jungle_Rumble/src/HUDRenderer.cpp

@@ -232 +232 @@
 
                                 if(GLOBAL_display_help_screenQ) {
-                                                //std::wstring str_helpscreen(this->myScene->manager->HelpScreenString_Get());
-                                                //this->myScene->manager->
-                //myFont->DrawText(sprite, hud->messagestring.c_str(), -1, &helpRectangle, DT_LEFT | DT_WORDBREAK, fontColor);
-                                                //myFont->DrawText(sprite, str_helpscreen.c_str(), -1, &helpRectangle, DT_LEFT | DT_WORDBREAK, fontColor);
                                                 myFont->DrawText(sprite, this->myScene->manager->HelpScreenString_Get().c_str(), -1, &helpRectangle, DT_LEFT | DT_WORDBREAK, fontColor);
                                 }
@@ -241 +237 @@
                                         // No help screen active => display message (if active)
                                         if (hud->messagetimer < hud->messagethreshold) {
-                                                //hud->messagetimer += hud->messagedt;
-                                                //if(!hud->bHelp) {
                                                 myFont->DrawText(sprite, hud->messagestring.c_str(), -1, &textRectangle, DT_CENTER | DT_WORDBREAK, fontColor);
-                                                //} 
                                         }
                                 }