Changeset 10124 for code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h

Timestamp:

Nov 12, 2014, 4:11:00 PM (11 years ago)

Author:

sriedel

Message:

still working atm. including function after function, currently HUD.

File:

• code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h (modified) (2 diffs)

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

@@ -75 +75 @@
             bool isFireing;
 
+        protected:
+            virtual void death();
+
         private:
             WeakPtr<DodgeRace> getGame();
             WeakPtr<DodgeRace> game;
+            WeakPtr<Projectile> lastShot;
             Camera* camera;
             float lastTimeFront, lastTimeLeft, lastTime;
@@ -90 +94 @@
 
 /*
-
-
-            //virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-
-        protected:
-            virtual void death();
+                         virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
 
         private:
 
-
-
-
-
-
-
-           // WeakPtr<DodgeRaceEnemy> lastEnemy;
-            WeakPtr<Projectile> lastShot;*/
+            WeakPtr<DodgeRaceEnemy> lastEnemy;
+           */
 
     };