From 42e51f90d84089aa6ecf4b84939bd57b89fe125e Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Fri, 8 Jul 2005 18:43:40 +0000 Subject: [PATCH] fixed a bug and some reordering --- robbersrc/robber.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/robbersrc/robber.cpp b/robbersrc/robber.cpp index 50db510..abf638b 100644 --- a/robbersrc/robber.cpp +++ b/robbersrc/robber.cpp @@ -20,16 +20,17 @@ string Robber::turn(){ Intersection& conInter = _intersections[street->first]; list closestFootCop = shortestPath(street->first, cop_foot, FindPlayer(_players, cop_foot, 6), true); - list closestCarCop = shortestPath(street->first, cop_car, FindPlayer(_players, cop_car, closestFootCop.size() - 1), true); - - unsigned int closestCop = 0; + unsigned int closestCop = closestFootCop.size(); + //cerr << "Cop on fot " << closestCop << " intersections away." << endl; bool copInCar = false; + list closestCarCop = shortestPath(street->first, cop_car, FindPlayer(_players, cop_car, closestCop > 0 ? closestCop : 5), true); + //cerr << "Cop in car " << closestCarCop.size() << " intersections away." << endl; + if (closestCarCop.size() > 0){ closestCop = closestCarCop.size(); copInCar = true; - }else - closestCop = closestFootCop.size(); + } if (closestCop > 0 && closestCop < 3){ //cerr << "Cop " << closestCop << " intersections away." << endl; @@ -106,6 +107,7 @@ string Robber::turn(){ } } _oldLocation = _location; + //cerr << "Moving to: " << destination << endl; return destination; -- 2.39.2