Changeset 1406 for GTP/trunk

Timestamp:

09/18/06 02:54:51 (18 years ago)

Author:

giegl

Message:

GTPD - Jungle Rumble - GLOBAL_player_freezeQ (F6 kill opponents, F7 freeze player) working

Location:

GTP/trunk/App/Games/Jungle_Rumble

Files:

• bin/JungleRumble.exe (modified) (previous)
• bin/config.xml (modified) (1 diff)
• src/GameManager.cpp (modified) (2 diffs)
• src/GameScene.cpp (modified) (2 diffs)
• src/UserPlayer.cpp (modified) (1 diff)

GTP/trunk/App/Games/Jungle_Rumble/bin/config.xml

@@ -3 +3 @@
         <width>1024</width>
         <height>768</height>
-        <fullscreen>0</fullscreen> <!-- 1 = TRUE, 0 = FALSE -->
+        <fullscreen>1</fullscreen> <!-- 1 = TRUE, 0 = FALSE -->
         <cubemapsize>512</cubemapsize> <!-- 512, 1024, 2048, ... - current ATI cards have problems with size above 512 -->
         <physxdebug>0</physxdebug>   <!-- 1 = TRUE, 0 = FALSE -->

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

@@ -105 +105 @@
                                                 #if(0)
                                                         this->gs.getHUD()->message("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", 2, 0.01f, true);
-                                                #elif(0) // MG
-                                                        std::string s("");
-                                                        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";
-                                                        
-                                                        s += "\n F9: Depth Imposters On/Off ";
-                                                        if(this->gs.useDepthImposter) { s+= "[ON]"; } else { s+= "[OFF]"; }
-                                                        
-                                                        s += "\n F10: Raytracer On/Off ";
-                                                        if(this->gs.useRaytracer) { s+= "[ON]"; } else { s+= "[OFF]"; }
-                                                        
-                                                        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";
-                                                        this->gs.getHUD()->message(s, 2, 0.01f, true);
                                                 #elif(1) // MG
                                                         // Toggle help with F1
@@ -146 +134 @@
                                 case VK_F6:
                                         //this->gs.getHUD()->message("hallo martin", 3, 0.01f);
+                                        if(this->activeScene == &this->gs) { gs.hasWon();       } // MG
                                         break;
                                 case VK_F7:

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

@@ -136 +136 @@
         this->currentlypaused = false;
         this->preparepaused = false;
+
+        GLOBAL_player_freezeQ = false;
+
         Scene::initScene(_manager);
         
@@ -991 +994 @@
                 }
                 if(this->won && this->resultShowingTimer<=5.75f) {
-                        //this->player->resetValues();
-                        GLOBAL_player_freezeQ = true;
+                        this->player->resetValues();
+                        //GLOBAL_player_freezeQ = true;
                         this->ignoreKeys = true;
                 }

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

@@ -73 +73 @@
         if(GLOBAL_player_freezeQ) { 
                 this->setBehaveAs(Node::KINEMATIC);
+                if(this->winPe->isEmitting()) {
+                        this->winPe->update(dt);
+                }
                 return; 
         }