[Orxonox-commit 6005] r10664 - in code/branches/hoverHS15: data/levels src/modules/hover

[meierman at orxonox.net]

Author: meierman
Date: 2015-10-19 15:15:11 +0200 (Mon, 19 Oct 2015)
New Revision: 10664

Modified:
   code/branches/hoverHS15/data/levels/Hover.oxw
   code/branches/hoverHS15/src/modules/hover/Hover.cc
   code/branches/hoverHS15/src/modules/hover/Hover.h
   code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h
   code/branches/hoverHS15/src/modules/hover/HoverShip.cc
Log:
First (emptz) functioning version

Modified: code/branches/hoverHS15/data/levels/Hover.oxw
===================================================================
--- code/branches/hoverHS15/data/levels/Hover.oxw	2015-10-19 13:08:34 UTC (rev 10663)
+++ code/branches/hoverHS15/data/levels/Hover.oxw	2015-10-19 13:15:11 UTC (rev 10664)
@@ -16,6 +16,7 @@
 ?>
 
 <Level
+plugins = hover
 gametype = Hover
 >
   <templates>

Modified: code/branches/hoverHS15/src/modules/hover/Hover.cc
===================================================================
--- code/branches/hoverHS15/src/modules/hover/Hover.cc	2015-10-19 13:08:34 UTC (rev 10663)
+++ code/branches/hoverHS15/src/modules/hover/Hover.cc	2015-10-19 13:15:11 UTC (rev 10664)
@@ -40,7 +40,7 @@
 {
     RegisterUnloadableClass(Hover);
 
-    Hover::Hover(Context* context) : GameType(context)
+    Hover::Hover(Context* context) : Gametype(context)
     {
         RegisterObject(Hover);
 
@@ -62,7 +62,7 @@
 
 
         // Call start for the parent class.
-        GameType::start();
+        Gametype::start();
     }
 
 

Modified: code/branches/hoverHS15/src/modules/hover/Hover.h
===================================================================
--- code/branches/hoverHS15/src/modules/hover/Hover.h	2015-10-19 13:08:34 UTC (rev 10663)
+++ code/branches/hoverHS15/src/modules/hover/Hover.h	2015-10-19 13:15:11 UTC (rev 10664)
@@ -35,14 +35,13 @@
 #ifndef _Hover_H__
 #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"
 #include "core/config/ConfigValueIncludes.h"
@@ -55,15 +54,13 @@
 #include "infos/PlayerInfo.h"
 
 #include "core/command/ConsoleCommand.h"
-#include "worldentities/BigExplosion.h"
 
-#include "gametypes/Deathmatch.h"
 #include "tools/Timer.h"
 
 namespace orxonox
 {
 
-    class _HoverExport Hover : public GameType
+    class _HoverExport Hover : public Gametype
     {
        public:
             Hover(Context* context);
@@ -73,8 +70,8 @@
 
             virtual void tick(float dt);
 
-            void setCenterpoint(HoverCenterPoint* center)
-                       { this->center_ = center; }
+ //           void setCenterpoint(HoverCenterPoint* center)
+  //                     { this->center_ = center; }
 
 
     };

Modified: code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h
===================================================================
--- code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h	2015-10-19 13:08:34 UTC (rev 10663)
+++ code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h	2015-10-19 13:15:11 UTC (rev 10664)
@@ -67,7 +67,7 @@
 
 namespace orxonox
 {
-    class Hover:
+    class Hover;
     class HoverShip;
 }
 

Modified: code/branches/hoverHS15/src/modules/hover/HoverShip.cc
===================================================================
--- code/branches/hoverHS15/src/modules/hover/HoverShip.cc	2015-10-19 13:08:34 UTC (rev 10663)
+++ code/branches/hoverHS15/src/modules/hover/HoverShip.cc	2015-10-19 13:15:11 UTC (rev 10664)
@@ -48,15 +48,15 @@
         SUPER(HoverShip, tick, dt);
     }
 
-    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)
             {
                 game = *it;
             }
         }
-        return game;*/
-    }
+        return game;
+    }*/
 }