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

Timestamp:

Nov 26, 2014, 3:59:37 PM (9 years ago)

Author:

sriedel

Message:

Working version, Blockpattern are strange.

File:

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

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

@@ -42 +42 @@
         RegisterObject(DodgeRaceShip);
 
-        speed = 500;
+        speed = 800;
         isFireing = false;
         damping = 10;
@@ -82 +82 @@
                     }
             }
+            /*
             if (pos.z + dist_x > 42*2.5 || pos.z + dist_x < -42*3)
-                velocity.x = 0;
+            {
+                velocity.x = 0;
+            }
+            */
             pos += Vector3(1000 + velocity.y, 0, velocity.x) * dt;
         }
@@ -99 +103 @@
         if (camera != NULL)
         {
-            camera->setPosition(Vector3(-pos.z, -posforeward, 0));
+            // camera->setPosition(Vector3(-pos.z, -posforeward, 0));
             camera->setOrientation(Vector3::UNIT_Z, Degree(0));
         }
@@ -145 +149 @@
     void DodgeRaceShip::boost(bool bBoost)
     {
-        isFireing = bBoost;
+        //isFireing = bBoost;
     }
 
     inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
+        /*
         if (otherObject != NULL && lastEntity != otherObject)
         {
                 lastEntity = otherObject;
                 removeHealth(20);
-            //this->death();
         }
+                */
 
+
+        this->death();
         return false;
     }