Changeset 11838 for code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.cc

Timestamp:

Mar 29, 2018, 3:30:24 PM (7 years ago)

Author:

jacobsr

Message:

changed interal definition to orxyroad namespace

File:

• code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.cc (modified) (7 diffs)

code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.cc

@@ -28 +28 @@
 
 /**
-    @file DodgeRaceShip.cc
-    @brief Implementation of the DodgeRaceShip class.
+    @file OrxyRoadShip.cc
+    @brief Implementation of the OrxyRoadShip class.
 */
 
-#include "DodgeRaceShip.h"
+#include "OrxyRoadShip.h"
 #include "core/CoreIncludes.h"
 
 namespace orxonox
 {
-    RegisterClass(DodgeRaceShip);
+    RegisterClass(OrxyRoadShip);
 
-    DodgeRaceShip::DodgeRaceShip(Context* context) : SpaceShip(context)
+    OrxyRoadShip::OrxyRoadShip(Context* context) : SpaceShip(context)
     {
-        RegisterObject(DodgeRaceShip);
+        RegisterObject(OrxyRoadShip);
 
         speed = 830;
@@ -53 +53 @@
     }
 
-    void DodgeRaceShip::tick(float dt)
+    void OrxyRoadShip::tick(float dt)
     {
         Vector3 pos = getPosition();
@@ -115 +115 @@
         }
 
-        SUPER(DodgeRaceShip, tick, dt);
+        SUPER(OrxyRoadShip, tick, dt);
     }
 
-    void DodgeRaceShip::updateLevel()
+    void OrxyRoadShip::updateLevel()
     {
         lastTime = 0;
@@ -125 +125 @@
     }
 
-    void DodgeRaceShip::moveFrontBack(const Vector2& value)
+    void OrxyRoadShip::moveFrontBack(const Vector2& value)
     {
         //lastTimeFront = 0;
@@ -132 +132 @@
     }
 
-    void DodgeRaceShip::moveRightLeft(const Vector2& value)
+    void OrxyRoadShip::moveRightLeft(const Vector2& value)
     {
         lastTimeLeft = 0;
         desiredVelocity.x = value.x * speed;
     }
-    void DodgeRaceShip::boost(bool bBoost)
+    void OrxyRoadShip::boost(bool bBoost)
     {
         //getGame()->bEndGame = bBoost;
     }
 
-    inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
+    inline bool OrxyRoadShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
 
@@ -150 +150 @@
     }
 
-    DodgeRace* DodgeRaceShip::getGame()
+    OrxyRoad* OrxyRoadShip::getGame()
     {
         if (game == nullptr)
         {
-            for (DodgeRace* race : ObjectList<DodgeRace>())
+            for (OrxyRoad* race : ObjectList<OrxyRoad>())
             {
                 game = race;
@@ -162 +162 @@
     }
 
-    void DodgeRaceShip::death()
+    void OrxyRoadShip::death()
     {
         getGame()->costLife();