Changeset 12105

Timestamp:

Nov 14, 2018, 11:58:59 AM (6 years ago)

Author:

samuelbl

Message:

Player update

Location:

code/branches/wagnis_HS18/src/modules/wagnis

Files:

• WagnisPlayer.cc (modified) (3 diffs)
• WagnisPlayer.h (modified) (1 diff)

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

@@ -68 +68 @@
     }
     
-    //TODO
-    bool WagnisPlayer::isNeighbour(WagnisProvince*,WagnisProvince*)
-    {
-        for ()
-        
-        return false;
-    }
-
-    //TODO
-    bool WagnisPlayer::existPath(WagnisProvince*,WagnisProvince*)
-    {
-        return false;
-    }
-    
     //
     void WagnisPlayer::setTroops(WagnisProvince*){
@@ -101 +87 @@
     //private function for CheckMove
     //checks if provinces are neighbours for move
-    bool isNeighbour(WagnisProvince*,WagnisProvince*)
+    bool WagnisPlayer::isNeighbour(WagnisProvince*,WagnisProvince*)
     {
-        for (int i = 0; i < this->origin->getNeighbours().size(); ++i)
+        for (int i = 0; i < this->origin->neighbors.size(); ++i)
         {
-            if (this->target == this->origin->getNeighbours()(i))
+            if (this->target == this->origin->neighbors(i))
                 return true;
         }
@@ -114 +100 @@
     //private function for CheckMove
     //checks if path is complete with provinces owned by player
-    bool existPath(WagnisProvince*,WagnisProvince*)
+    bool WagnisPlayer::existPath(WagnisProvince*,WagnisProvince*)
     {
-        WagnisProvince
+        if (this->origin->getOwner_ID() == this->target->getOwner_ID() && isNeighbour(this->origin, this->target))
+            return true;
+        
+        for (int i = 0; i < this->origin->neighbors.size(); ++i)
+        {
+            if (this->origin->getOwner_ID() == this->origin->neighbors(i)->getOwner_ID())
+                return existPath(this->origin->neighbors(i), this->target);
+        }
+            
+        return false;
     }
 }

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

@@ -40 +40 @@
         WagnisProvince* target;
         bool isNeighbour(WagnisProvince*,WagnisProvince*);
-        bool existPath(WagnisProvince*,WagnisProvince*)
+        bool existPath(WagnisProvince*,WagnisProvince*);
     };
 }