Changeset 10708 for code/branches/hoverHS15/src

Timestamp:

Oct 26, 2015, 4:07:58 PM (9 years ago)

Author:

meierman

Message:

HoverWall introduced

Location:

code/branches/hoverHS15/src/modules/hover

Files:

• CMakeLists.txt (modified) (2 diffs)
• Hover.cc (modified) (4 diffs)
• HoverPrereqs.h (modified) (1 diff)

code/branches/hoverHS15/src/modules/hover/CMakeLists.txt

@@ -2 +2 @@
 Hover.cc
 HoverShip.cc
+HoverWall.cc
 )
 
@@ -8 +9 @@
   FIND_HEADER_FILES
   LINK_LIBRARIES
+        objects
     orxonox
     overlays

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

@@ -34 +34 @@
 //#include "orxonox/worldentities/pawns/SpaceShip.h"
 #include "Hover.h"
-//#include "HoverShip.h" // Necessary for getPlayer function. Do NOT include this in Header!
+
+#include "HoverWall.h"
 #include "core/CoreIncludes.h"
 
@@ -43 +44 @@
     Hover::Hover(Context* context) : Gametype(context)
     {
+        
         RegisterObject(Hover);
-
+        new HoverWall(context);
         //this->setHUDTemplate("HoverHUD");
     }
@@ -52 +54 @@
     void Hover::tick(float dt)
     {
-
         SUPER(Hover, tick, dt);
     }
@@ -61 +62 @@
     {
 
-
         // Call start for the parent class.
         Gametype::start();
+
     }
 

code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h

@@ -70 +70 @@
     class Hover;
     class HoverShip;
+    class HoverWall;
 }