Changeset 10624 for code/trunk/src/modules/towerdefense

Timestamp:

Oct 4, 2015, 9:12:21 PM (9 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/towerdefense/CMakeLists.txt (modified) (1 diff)
• src/modules/towerdefense/TDCoordinate.h (modified) (2 diffs)
• src/modules/towerdefense/TowerDefense.cc (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseEnemy.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseEnemy.h (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseHUDController.cc (modified) (1 diff)

code/trunk/src/modules/towerdefense/CMakeLists.txt

@@ -11 +11 @@
 
 ORXONOX_ADD_LIBRARY(towerdefense
-  MODULE
+  PLUGIN
   FIND_HEADER_FILES
   LINK_LIBRARIES

code/trunk/src/modules/towerdefense/TDCoordinate.h

@@ -2 +2 @@
 #define _TDCoordinate_H__
 
-#include "core/CoreIncludes.h"
 #include "TDCoordinate.h"
 //#include "towerdefense/TowerDefense.h"
@@ -13 +12 @@
 //Class to save the Coordinates in a class instead of struct
 //Convert 2d coordinates to 3d in order to set waypoints
-    class _TowerDefenseExport TDCoordinate : public OrxonoxClass
+    class _TowerDefenseExport TDCoordinate
     {
         public:

code/trunk/src/modules/towerdefense/TowerDefense.cc

@@ -85 +85 @@
 #include "core/CoreIncludes.h"
 /* Part of a temporary hack to allow the player to add towers */
-#include "core/command/ConsoleCommand.h"
+#include "core/command/ConsoleCommandIncludes.h"
 #include <cmath>
 

code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc

@@ -83 +83 @@
     /**
     @brief
-        Is called when the gametype has changed.
-    */
-    void TowerDefenseCenterpoint::changedGametype()
-    {
-        SUPER(TowerDefenseCenterpoint, changedGametype);
-
-        // Check, whether it's still TowerDefense.
-        this->checkGametype();
-    }
-
-    /**
-    @brief
         Checks whether the gametype is TowerDefense and if it is, sets its centerpoint.
     */
@@ -102 +90 @@
         {
             // Sets the centerpoint of the gametype. The gametype uses this to later spawn in towers, he needs the tower template stored in the center point
-            TowerDefense* towerDefenseGametype = orxonox_cast<TowerDefense*>(this->getGametype().get());
+            TowerDefense* towerDefenseGametype = orxonox_cast<TowerDefense*>(this->getGametype());
             towerDefenseGametype->setCenterpoint(this);
         }

code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h

@@ -53 +53 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedGametype();
 
             /**

code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc

@@ -29 +29 @@
         this->setCollisionType(WorldEntity::Dynamic);
         //needed to keep track of the PlayerStats coded in TowerDefense.h
-        this->td = orxonox_cast<TowerDefense*>(this->getGametype().get());
+        this->td = orxonox_cast<TowerDefense*>(this->getGametype());
         once_=false;
 
@@ -53 +53 @@
     }
 
-    WeakPtr<TowerDefense> TowerDefenseEnemy::getGame()
+    TowerDefense* TowerDefenseEnemy::getGame()
     {
         if (game == NULL)

code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h

@@ -47 +47 @@
 
     private:
-        WeakPtr<TowerDefense> getGame();
+        TowerDefense* getGame();
         WeakPtr<TowerDefense> game;
         TowerDefense* td;

code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc

@@ -80 +80 @@
             if (this->getOwner() && this->getOwner()->getGametype())
                     {
-                        this->td = orxonox_cast<TowerDefense*>(this->getOwner()->getGametype().get());
+                        this->td = orxonox_cast<TowerDefense*>(this->getOwner()->getGametype());
                     }
                     else