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

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/mini4dgame/CMakeLists.txt (modified) (1 diff)
• src/modules/mini4dgame/Mini4Dgame.cc (modified) (1 diff)
• src/modules/mini4dgame/Mini4DgameBoard.cc (modified) (2 diffs)
• src/modules/mini4dgame/Mini4DgameBoard.h (modified) (1 diff)

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

@@ -6 +6 @@
 
 ORXONOX_ADD_LIBRARY(mini4dgame
-  MODULE
+  PLUGIN
   FIND_HEADER_FILES
   LINK_LIBRARIES

code/trunk/src/modules/mini4dgame/Mini4Dgame.cc

@@ -45 +45 @@
 #include "core/config/ConfigValueIncludes.h"
 #include "infos/PlayerInfo.h"
-#include "core/command/ConsoleCommand.h"
+#include "core/command/ConsoleCommandIncludes.h"
 
 #include "gamestates/GSLevel.h"

code/trunk/src/modules/mini4dgame/Mini4DgameBoard.cc

@@ -901 +901 @@
     /**
     @brief
-        Is called when the gametype has changed.
-    */
-    void Mini4DgameBoard::changedGametype()
-    {
-        SUPER(Mini4DgameBoard, changedGametype);
-
-        // Check, whether it's still Mini4Dgame.
-        this->checkGametype();
-    }
-
-    /**
-    @brief
         Checks whether the gametype is Mini4Dgame and if it is, sets its centerpoint.
     */
@@ -919 +907 @@
         if (this->getGametype() != NULL && this->getGametype()->isA(Class(Mini4Dgame)))
         {
-            Mini4Dgame* Mini4DgameGametype = orxonox_cast<Mini4Dgame*>(this->getGametype().get());
+            Mini4Dgame* Mini4DgameGametype = orxonox_cast<Mini4Dgame*>(this->getGametype());
             Mini4DgameGametype->setGameboard(this);
         }

code/trunk/src/modules/mini4dgame/Mini4DgameBoard.h

@@ -81 +81 @@
             Mini4DgameWinner getWinner();
 
-            void changedGametype();
             void checkGametype();