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

Timestamp:

Dec 10, 2014, 3:40:05 PM (11 years ago)

Author:

sriedel

Message:

Final version

File:

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

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

@@ -42 +42 @@
         RegisterObject(DodgeRaceShip);
 
-        speed = 800;
+        speed = 830;
         isFireing = false;
         damping = 10;
@@ -68 +68 @@
         {
             float dist_y = velocity.y * dt;
-            float dist_x = velocity.x * dt;
+            //float dist_x = velocity.x * dt;
             if(dist_y + posforeward > -42*3 && dist_y + posforeward < 42*6)
                 posforeward += dist_y;
@@ -75 +75 @@
                 velocity.y = 0;
                 // restart if game ended
-                /*
+/*
                 if (getGame())
                     if (getGame()->bEndGame)
@@ -83 +83 @@
                     }*/
             }
-            /*
-            if (pos.z + dist_x > 42*2.5 || pos.z + dist_x < -42*3)
-            {
-                velocity.x = 0;
-            }
-            */
+
             pos += Vector3(1000 + velocity.y, 0, velocity.x) * dt;
-        }
-
-        // shoot!
-        if (isFireing)
-        {
-                //pos += Vector3(900, 0, 0) * dt;
-            //ControllableEntity::fire(0);
         }
 
@@ -150 +138 @@
     void DodgeRaceShip::boost(bool bBoost)
     {
-        //isFireing = bBoost;
+        //getGame()->bEndGame = bBoost;
     }
 
     inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        /*
-        if (otherObject != NULL && lastEntity != otherObject)
-        {
-                lastEntity = otherObject;
-                removeHealth(20);
-        }
-                */
 
         removeHealth(100);