Changeset 9884 for code/branches

Timestamp:

Dec 9, 2013, 2:53:57 PM (11 years ago)

Author:

zifloria

Message:

finito! (apart from explosions)

Location:

code/branches/invaders

Files:

• data/levels/Invaders.oxw (modified) (1 diff)
• src/modules/invader/InvaderHUDinfo.cc (modified) (1 diff)
• src/modules/invader/InvaderShip.cc (modified) (2 diffs)

code/branches/invaders/data/levels/Invaders.oxw

@@ -31 +31 @@
     skybox     = "Orxonox/skyBoxBasic"
   >
+
+  <WorldAmbientSound
+    source="Earth.ogg"
+    looping="true"
+    playOnLoad="true"
+  />
 
     <!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->

code/branches/invaders/src/modules/invader/InvaderHUDinfo.cc

@@ -74 +74 @@
                 {
                     setPosition(Vector2(0.1, 0.65));
-                    this->setCaption("Game ends in 30 seconds.\nPress (e)xit / (q)uit to go to the main menu.\nTo restart press space.");
+                    this->setCaption("Game ends in 30 seconds.\nPress (e)xit / (q)uit to go to the main menu.\nTo restart fly out of the screen!");
                     setTextSize(0.05);
                     this->InvaderGame->bEndGame = true;

code/branches/invaders/src/modules/invader/InvaderShip.cc

@@ -71 +71 @@
                 posforeward += dist_y;
             else
+            {
                 velocity.y = 0;
+                // restart if game ended
+                if (getGame())
+                    if (getGame()->bEndGame)
+                    {
+                        getGame()->start();
+                        return;
+                    }
+            }
             if (pos.z + dist_x > 42*2.5 || pos.z + dist_x < -42*3)
                 velocity.x = 0;
@@ -129 +138 @@
     {
         isFireing = bBoost;
-        // restart if game ended
-        if (getGame())
-            if (getGame()->bEndGame)
-                getGame()->start();
     }
     inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)