Changeset 10118 for code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc

Timestamp:

Nov 12, 2014, 3:58:59 PM (9 years ago)

Author:

sriedel

Message:

Working atm. including function after function.

File:

• code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified) (7 diffs)

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc

@@ -34 +34 @@
 #include "DodgeRaceShip.h"
 
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-//#include "DodgeRace.h"
-
 namespace orxonox
 {
@@ -49 +45 @@
         isFireing = false;
         damping = 10;
+
+        lastTimeFront = 0;
+        lastTimeLeft = 0;
+        lastTime = 0;
     }
 
@@ -106 +106 @@
         setPosition(pos);
         setOrientation(Vector3::UNIT_Y, Degree(270));
-
+/*
         // Level up!
         if (pos.x > 42000)
@@ -113 +113 @@
             setPosition(Vector3(0, 0, pos.z)); // pos - Vector3(30000, 0, 0)
         }
-
+*/
         SUPER(DodgeRaceShip, tick, dt);
     }
@@ -139 +139 @@
         isFireing = bBoost;
     }
-   /* inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    /*
+    inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
         // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
@@ -169 +170 @@
         return false;
         // SUPER(DodgeRaceShip, collidesAgainst, otherObject, contactPoint);
-    }*/
-
+    }
+*/
     WeakPtr<DodgeRace> DodgeRaceShip::getGame()
     {
@@ -176 +177 @@
         {
             for (ObjectList<DodgeRace>::iterator it = ObjectList<DodgeRace>::begin(); it != ObjectList<DodgeRace>::end(); ++it)
-                game = *it;
+            {
+                game = *it;
+            }
         }
         return game;
     }
-
+/*
     void DodgeRaceShip::death()
     {
         getGame()->costLife();
         SpaceShip::death();
-    }
+    }*/
 }