Changeset 10659 for code/branches/hoverHS15/src/modules/hover/HoverShip.cc

Timestamp:

Oct 19, 2015, 2:40:08 PM (9 years ago)

Author:

bucyril

Message:

1234

M hover/Hover.cc
M hover/Hover.h
M hover/HoverShip.cc
A hover/HoverPrereqs.h
M hover/HoverShip.h

File:

• code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified) (8 diffs)

code/branches/hoverHS15/src/modules/hover/HoverShip.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      Cyrill Burgener
  *   Co-authors:
  *      ...
@@ -28 +28 @@
 
 /**
-    @file DodgeRaceShip.cc
-    @brief Implementation of the DodgeRaceShip class.
+    @file HoverShip.cc
+    @brief Implementation of the HoverShip class.
 */
 
-#include "DodgeRaceShip.h"
+#include "HoverShip.h"
 #include "core/CoreIncludes.h"
 
 namespace orxonox
 {
-    RegisterClass(DodgeRaceShip);
+    RegisterClass(HoverShip);
 
-    DodgeRaceShip::DodgeRaceShip(Context* context) : SpaceShip(context)
+    HoverShip::HoverShip(Context* context) : SpaceShip(context)
     {
-        RegisterObject(DodgeRaceShip);
+        RegisterObject(HoverShip);
 
         speed = 830;
@@ -53 +53 @@
     }
 
-    void DodgeRaceShip::tick(float dt)
+    void HoverShip::tick(float dt)
     {
         Vector3 pos = getPosition();
@@ -115 +115 @@
         }
 
-        SUPER(DodgeRaceShip, tick, dt);
+        SUPER(HoverShip, tick, dt);
     }
 
-    void DodgeRaceShip::updateLevel()
+    void HoverShip::updateLevel()
     {
         lastTime = 0;
@@ -125 +125 @@
     }
 
-    void DodgeRaceShip::moveFrontBack(const Vector2& value)
+    void HoverShip::moveFrontBack(const Vector2& value)
     {
         //lastTimeFront = 0;
@@ -132 +132 @@
     }
 
-    void DodgeRaceShip::moveRightLeft(const Vector2& value)
+    void HoverShip::moveRightLeft(const Vector2& value)
     {
         lastTimeLeft = 0;
         desiredVelocity.x = value.x * speed;
     }
-    void DodgeRaceShip::boost(bool bBoost)
+    void HoverShip::boost(bool bBoost)
     {
         //getGame()->bEndGame = bBoost;
     }
 
-    inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    inline bool HoverShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
 
@@ -150 +150 @@
     }
 
-    DodgeRace* DodgeRaceShip::getGame()
+    Hover* HoverShip::getGame()
     {
         if (game == NULL)
         {
-            for (ObjectList<DodgeRace>::iterator it = ObjectList<DodgeRace>::begin(); it != ObjectList<DodgeRace>::end(); ++it)
+            for (ObjectList<Hover>::iterator it = ObjectList<Hover>::begin(); it != ObjectList<Hover>::end(); ++it)
             {
                 game = *it;
@@ -162 +162 @@
     }
 
-    void DodgeRaceShip::death()
+    void HoverShip::death()
     {
         getGame()->costLife();