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

Timestamp:

Nov 19, 2014, 4:00:53 PM (10 years ago)

Author:

sriedel

Message:

Should work so far

File:

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

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

@@ -79 +79 @@
 
         private:
+            virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
             WeakPtr<DodgeRace> getGame();
             WeakPtr<DodgeRace> game;
             WeakPtr<Projectile> lastShot;
+            WeakPtr<WorldEntity> lastEntity;
             Camera* camera;
             float lastTimeFront, lastTimeLeft, lastTime;
@@ -90 +92 @@
             } velocity, desiredVelocity;
 
-
-
-
-/*
-                         virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-
-        private:
-
-            WeakPtr<DodgeRaceEnemy> lastEnemy;
-           */
-
     };
 }