Changeset 12080

Timestamp:

Nov 7, 2018, 10:44:00 AM (6 years ago)

Author:

stadlero

Message:

private variables added in player class

Location:

code/branches/wagnis_HS18/src/modules/wagnis

Files:

• CMakeLists.txt (modified) (1 diff)
• WagnisGameboard.cc (modified) (1 diff)
• WagnisPlayer.cc (modified) (2 diffs)
• WagnisPlayer.h (modified) (2 diffs)

code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt

@@ -2 +2 @@
   WagnisProvince.cc
   WagnisGameboard.cc
+  WagnisPlayer.cc
 )
 

code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.cc

@@ -37 +37 @@
         orxout() << "added" << endl;
         orxout() << province->getID() << endl;
+        
         this->provs.push_back(province);
     }

code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc

@@ -14 +14 @@
 
     //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
@@ -25 +28 @@
         
     }
+    //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){
 
     }

code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h

@@ -10 +10 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "WagnisProvince.h"
+#include "WagnisGameboard.h"
 #include <vector>
 #include <string>
+
+enum MoveType { ATTACK, MOVE, SET_TROOPS };
 
 
@@ -17 +21 @@
 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;
     };
 }