[Orxonox-commit 7474] r12080 - code/branches/wagnis_HS18/src/modules/wagnis

[stadlero at orxonox.net]

Author: stadlero
Date: 2018-11-07 10:44:00 +0100 (Wed, 07 Nov 2018)
New Revision: 12080

Modified:
   code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h
Log:
private variables added in player class

Modified: code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt	2018-11-07 09:38:34 UTC (rev 12079)
+++ code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt	2018-11-07 09:44:00 UTC (rev 12080)
@@ -1,6 +1,7 @@
 SET_SOURCE_FILES(WAGNIS_SRC_FILES
   WagnisProvince.cc
   WagnisGameboard.cc
+  WagnisPlayer.cc
 )
 
 ORXONOX_ADD_LIBRARY(wagnis

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc	2018-11-07 09:38:34 UTC (rev 12079)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc	2018-11-07 09:44:00 UTC (rev 12080)
@@ -36,6 +36,7 @@
     void WagnisGameboard::addProvince(WagnisProvince* province){
         orxout() << "added" << endl;
         orxout() << province->getID() << endl;
+        
         this->provs.push_back(province);
     }
     //XML get province

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc	2018-11-07 09:38:34 UTC (rev 12079)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc	2018-11-07 09:44:00 UTC (rev 12080)
@@ -13,8 +13,11 @@
     RegisterClass(WagnisPlayer);
 
     //Constructor
-    WagnisPlayer::WagnisPlayer(Context* context) : OrxonoxClass(context){
+    WagnisPlayer::WagnisPlayer(Context* context,WagnisGameboard* gb) : Baseclass(context){
         RegisterObject(WagnisPlayer);
+        this->origin = nullptr;
+        this->target = nullptr;
+        this->gameBoard = gb;
     }
     //Destructor
     WagnisPlayer::~WagnisPlayer(){
@@ -24,8 +27,12 @@
     void WagnisPlayer::playerTurn(WagnisGameboard* gameBoard){
         
     }
+    //checks if a move is valid
+    bool WagnisPlayer::checkMove(WagnisGameboard*,WagnisProvince*,WagnisProvince*){
+        return false;
+    }
     //
-    void WagnisPlayer::setTroops(WagnisGameboard* gameBoard,WagnisProvince* prov){
+    void WagnisPlayer::setTroops(WagnisGameboard* gameBoard,WagnisProvince* prov,MoveType type){
 
     }
     void WagnisPlayer::attack(WagnisGameboard* gameBoard,WagnisProvince* own,WagnisProvince* target){

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h	2018-11-07 09:38:34 UTC (rev 12079)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h	2018-11-07 09:44:00 UTC (rev 12080)
@@ -9,29 +9,35 @@
 #include "OrxonoxPrereqs.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "WagnisProvince.h"
+#include "WagnisGameboard.h"
 #include <vector>
 #include <string>
 
+enum MoveType { ATTACK, MOVE, SET_TROOPS };
 
 
+
 namespace orxonox
 {
-    class WagnisPlayer : public OrxonoxClass
+    class WagnisPlayer : public BaseClass
     {
     public:
-        WagnisPlayer(Context*);
+        WagnisPlayer(Context*,WagnisGameboard*);
         virtual ~WagnisPlayer();
 
         void playerTurn(WagnisGameboard*);
-        bool checkMove(WagnisGameboard*,WagnisProvince*,WagnisProvince*)
-        void setTroops(WagnisGameboard*,WagnisProvince*);
-        void attack(WagnisGameboard*,WagnisProvince*,WagnisProvince*);
-        void moveTroops(WagnisGameboard*,WagnisProvince*,WagnisProvince*);
+        bool checkMove(WagnisProvince*,WagnisProvince*,MoveType);
+        void setTroops(WagnisProvince*);
+        void attack(WagnisProvince*,WagnisProvince*);
+        void moveTroops(WagnisProvince*,WagnisProvince*);
         std::string toString();
 
     private:
         int Player_ID;
-
+        WagnisGameboard* gameBoard;
+        WagnisProvince* origin;
+        WagnisProvince* target;
     };
 }