Changeset 10664

Timestamp:

Oct 19, 2015, 3:15:11 PM (9 years ago)

Author:

meierman

Message:

First (emptz) functioning version

Location:

code/branches/hoverHS15

Files:

• data/levels/Hover.oxw (modified) (1 diff)
• src/modules/hover/Hover.cc (modified) (2 diffs)
• src/modules/hover/Hover.h (modified) (4 diffs)
• src/modules/hover/HoverPrereqs.h (modified) (1 diff)
• src/modules/hover/HoverShip.cc (modified) (2 diffs)

code/branches/hoverHS15/data/levels/Hover.oxw

@@ -17 +17 @@
 
 <Level
+plugins = hover
 gametype = Hover
 >

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

@@ -41 +41 @@
     RegisterUnloadableClass(Hover);
 
-    Hover::Hover(Context* context) : GameType(context)
+    Hover::Hover(Context* context) : Gametype(context)
     {
         RegisterObject(Hover);
@@ -63 +63 @@
 
         // Call start for the parent class.
-        GameType::start();
+        Gametype::start();
     }
 

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

@@ -36 +36 @@
 #define _Hover_H__
 
-#include "Hover/HoverPrereqs.h"
-
-#include "HoverCenterPoint.h" // Necessary for WeakPointer??
+#include "HoverPrereqs.h"
+//#include "HoverCenterPoint.h" // Necessary for WeakPointer??
 //#include "HoverShip.h"        DO NOT include in Header. Will cause forward declaration issues
 
 //#include "HoverHUDinfo.h"
 
-
+#include "gametypes/Gametype.h"
 #include "core/EventIncludes.h"
 #include "core/command/Executor.h"
@@ -56 +55 @@
 
 #include "core/command/ConsoleCommand.h"
-#include "worldentities/BigExplosion.h"
 
-#include "gametypes/Deathmatch.h"
 #include "tools/Timer.h"
 
@@ -64 +61 @@
 {
 
-    class _HoverExport Hover : public GameType
+    class _HoverExport Hover : public Gametype
     {
        public:
@@ -74 +71 @@
             virtual void tick(float dt);
 
-            void setCenterpoint(HoverCenterPoint* center)
-                       { this->center_ = center; }
+ //           void setCenterpoint(HoverCenterPoint* center)
+  //                     { this->center_ = center; }
 
 

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

@@ -68 +68 @@
 namespace orxonox
 {
-    class Hover:
+    class Hover;
     class HoverShip;
 }

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

@@ -49 +49 @@
     }
 
-    Hover* HoverShip::getGame()
+   /* Hover* HoverShip::getGame()
     {
-        /*if (game == NULL)
+        if (game == NULL)
         {
             for (ObjectList<Hover>::iterator it = ObjectList<Hover>::begin(); it != ObjectList<Hover>::end(); ++it)
@@ -58 +58 @@
             }
         }
-        return game;*/
-    }
+        return game;
+    }*/
 }