Changeset 12164

Timestamp:

Dec 6, 2018, 8:45:47 PM (6 years ago)

Author:

samuelbl

Message:

Checkmove function fixed

Location:

code/branches/wagnis_HS18/src/modules/wagnis

Files:

• WagnisPlayer.cc (modified) (4 diffs)
• WagnisPlayer.h (modified) (2 diffs)
• WagnisProvince.h (modified) (1 diff)

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

@@ -7 +7 @@
 #include <cstdlib>
 #include <ctime>
+
 
 namespace orxonox
@@ -247 +248 @@
         if (move_type == MOVE)
         {
+            AlreadyChecked.clear();
             if (existPath(this->origin_province, this->target_province))//path exists, all belong to same player
             {
@@ -294 +296 @@
     bool WagnisPlayer::existPath(WagnisProvince* origin, WagnisProvince* target)
     {
+        AlreadyChecked.push_back(origin->getID());
+        
         if (origin->getOwner_ID() == target->getOwner_ID() && isNeighbour(origin, target))
             return true;
         
         for (unsigned int i = 0; i < origin->neighbors.size(); ++i)
-        {
-            if (origin->getOwner_ID() == origin->neighbors[i]->getOwner_ID())
+        {                
+            if ((origin->getOwner_ID() == origin->neighbors[i]->getOwner_ID()) && (!(contains(AlreadyChecked, origin->neighbors[i]->getID()))))
                 return existPath(origin->neighbors[i], target);
         }
-            
+        
         return false;
     }
@@ -347 +351 @@
     }
 
+    bool WagnisPlayer::contains(std::vector<int> a, int key)
+    {
+        if(std::count(a.begin(), a.end(), key))
+            return true;
+        else 
+            return false;
+    }
+    
     void WagnisPlayer::setActive(bool b){
         this->is_active = b;

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

@@ -17 +17 @@
 #include <string>
 #include "infos/HumanPlayer.h"
+#include <algorithm>
+#include <iostream>
+
 
 
@@ -50 +53 @@
         WagnisProvince* target_province;
         int reinforcements;
+        std::vector<int> AlreadyChecked;
         bool isNeighbour(WagnisProvince*, WagnisProvince*);
         bool existPath(WagnisProvince*, WagnisProvince*);
+        bool contains(std::vector<int>, int);
         int dice();
         int best3(int, int, int);

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

@@ -15 +15 @@
 #include <OgreColourValue.h>
 #include "tools/ToolsPrereqs.h"
-
 
 namespace orxonox