Changeset 9866 for code/branches/invaders

Timestamp:

Dec 2, 2013, 5:43:39 PM (11 years ago)

Author:

zifloria

Message:

no ending, no crash

Location:

code/branches/invaders

Files:

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

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

@@ -1 +1 @@
 <LevelInfo
- name = "Invader Test"
- description = "Invader Test"
- tags = "test"
+ name = "Orxonox Arcade"
+ description = "Arcade shooter. Maximise your points!!!"
+ tags = "minigame"
  screenshot = "emptylevel.png"
 />

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

@@ -139 +139 @@
     void Invader::end()
     {
+        orxout() << "STOP THE GAME, CHEATER!!!" << endl;
         // Call end for the parent class.
-        Deathmatch::end();
+        // Deathmatch::end();
     }
 }

code/branches/invaders/src/modules/invader/Invader.h

@@ -72 +72 @@
             void addPoints(int numPoints){point += numPoints * multiplier; b_combo = true;}
             void comboControll();
+            int lives;
         private:
             WeakPtr<InvaderCenterPoint> center_;
@@ -80 +81 @@
             Timer comboTimer;
             //Context* context;
-            int lives;
             int level;
             int point;

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

@@ -68 +68 @@
     inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        // setVelocity(Vector3(1000,0,0));
+        // setVelocity(Vector3(1500,0,0));
         removeHealth(2000);
         return false;

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

@@ -80 +80 @@
             {
                 const std::string& points = multi_cast<std::string>(this->InvaderGame->getPoints());
+                if (this->InvaderGame->lives <= 0)
+                {
+                    setTextSize(0.1);
+                    setPosition(Vector2(0.2, 0.5));
+                }
                 this->setCaption(points);
             }