Changeset 10131 for code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h

Timestamp:

Nov 19, 2014, 4:08:42 PM (10 years ago)

Author:

richtero

Message:

new structure: Board in separate class

File:

• code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (modified) (4 diffs)

code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h

@@ -37 +37 @@
 #include "gametypes/Deathmatch.h"
 #include "mini4Dgame/Mini4DgamePrereqs.h"
+#include "Mini4DgameCenterpoint.h"
+#include "Mini4DgameBoard.h"
 
 namespace orxonox
 {
+
         namespace mini4DgamePlayerColor
         {
@@ -51 +54 @@
         }
 
-        struct Mini4DgamePlayer
-        {
-            Player player;
-            mini4DgamePlayerColor::color color_;
-        };
-
-        struct Mini4DgameWinner
-        {
-                int winningRow[4];
-                int winningColumn[4];
-                int winningHeight[4];
-                int winningNumber[4];
-                mini4DgamePlayerColor::color color_;
-        };
     /**
     @brief
@@ -85 +74 @@
                 { this->center_ = center; }
 
+            static void setStone(Vector4 move, const int playerColor, Mini4DgameBoard* board);
+
             void win(Mini4DgameWinner winner);
 
@@ -94 +85 @@
             void cleanup(void); //!< Cleans up the Gametype by destroying the ball and the bats.
 
-            Mini4DgamePlayer players[2];
+            //Player players[2];
 
-            WeakPtr<Mini4DgameCenterpoint> center_; //!< The playing field.
+            WeakPtr<Mini4DgameCenterpoint> center_; //!< The centerpoint to which the objects are attached
+            WeakPtr<Mini4DgameBoard> board_;
     };
 }