done, for now

[icfp05.git] / robbersrc / robber.cpp

diff --git a/robbersrc/robber.cpp b/robbersrc/robber.cpp
index a9ab618d90cd144e81a4365a0f4a8b1110d097dd..50db5100faf9b561a99a9f451ca319e4b71b9f05 100644 (file)
--- a/robbersrc/robber.cpp
+++ b/robbersrc/robber.cpp
@@ -20,12 +20,12 @@ string Robber::turn(){
                Intersection& conInter = _intersections[street->first];
 
                list<string> closestFootCop = shortestPath(street->first, cop_foot, FindPlayer(_players, cop_foot, 6), true);
-               list<string> closestCarCop = shortestPath(street->first, cop_car, FindPlayer(_players, cop_car, 5), true);
+               list<string> closestCarCop = shortestPath(street->first, cop_car, FindPlayer(_players, cop_car, closestFootCop.size() - 1), true);
 
                unsigned int closestCop = 0;
                bool copInCar = false;
 
-               if (closestCarCop.size() < closestFootCop.size() && closestCarCop.size() > 0){
+               if (closestCarCop.size() > 0){
                        closestCop = closestCarCop.size();
                        copInCar = true;
                }else 
@@ -112,7 +112,7 @@ string Robber::turn(){
 }
 
 int main(){
-       Robber robber("robber");
+       Robber robber("harv-robber");
        robber.play();
 
        return 0;