Changeset 10128 for code/branches/surfaceraceHS14/src

Timestamp:

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

Author:

sriedel

Message:

Should work so far

Location:

code/branches/surfaceraceHS14/src/modules/dodgerace2

Files:

• DodgeRaceShip.cc (modified) (4 diffs)
• DodgeRaceShip.h (modified) (2 diffs)

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

@@ -89 +89 @@
         // shoot!
         if (isFireing)
-            ControllableEntity::fire(0);
+        {
+                //pos += Vector3(900, 0, 0) * dt;
+            //ControllableEntity::fire(0);
+        }
+
 
         // Camera
@@ -103 +107 @@
         // bring back on track!
         if(pos.y != 0)
-            pos.y = 0;
+        {
+                pos.y = 0;
+        }
 
         setPosition(pos);
@@ -135 +141 @@
     {
         lastTimeLeft = 0;
-        desiredVelocity.x = -value.x * speed;
+        desiredVelocity.x = value.x * speed;
     }
     void DodgeRaceShip::boost(bool bBoost)
@@ -141 +147 @@
         isFireing = bBoost;
     }
-    /*
+
     inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
-        WeakPtr<DodgeRaceEnemy> enemy = orxonox_cast<DodgeRaceEnemy*>(otherObject);
-        WeakPtr<Projectile> shot = orxonox_cast<Projectile*>(otherObject);
-        // ensure that this gets only called once per enemy.
-        if (enemy != NULL && lastEnemy != enemy)
+        if (otherObject != NULL && lastEntity != otherObject)
         {
-            lastEnemy = enemy;
+                lastEntity = otherObject;
+                removeHealth(20);
+            //this->death();
+        }
 
-            removeHealth(20);
-            if (getGame())
-            {
-                getGame()->multiplier = 1;
-            }
-        }
-        // was shot, decrease multiplier
-        else if (shot != NULL  && lastShot != shot)
-        {
-            if (getGame() && orxonox_cast<DodgeRaceEnemy*>(shot->getShooter()) != NULL)
-            {
-                if (getGame()->multiplier > 1)
-                {
-                    lastShot = shot;
-                    getGame()->multiplier -= 1;
-                }
-            }
-        }
         return false;
-        // SUPER(DodgeRaceShip, collidesAgainst, otherObject, contactPoint);
     }
-*/
+
     WeakPtr<DodgeRace> DodgeRaceShip::getGame()
     {

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;
-           */
-
     };
 }