From 8601a456878ba79c97b42571dc7e9d86dd717c40 Mon Sep 17 00:00:00 2001
From: GabrielTofvesson <gabriel.tofvesson@gmail.com>
Date: Tue, 11 Dec 2018 14:04:27 +0100
Subject: [PATCH] Changed types. get_build_location_near accepts a non-negative
integer: 0 indicates an exhaustive search
---
src/BuildingPlacer.cpp | 4 ++--
src/BuildingPlacer.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/BuildingPlacer.cpp b/src/BuildingPlacer.cpp
index 3369845..dfdfc96 100644
--- a/src/BuildingPlacer.cpp
+++ b/src/BuildingPlacer.cpp
@@ -95,7 +95,7 @@ bool BuildingPlacer::canBuildHereWithSpace(int bx, int by, const UnitType & type
return true;
}
-CCTilePosition BuildingPlacer::getBuildLocationNear(const CCTilePosition & p, const UnitType & t, int buildDist, int search_count) const
+CCTilePosition BuildingPlacer::getBuildLocationNear(const CCTilePosition & p, const UnitType & t, int buildDist, size_t search_count) const
{
//Timer t;
//t.start();
@@ -106,7 +106,7 @@ CCTilePosition BuildingPlacer::getBuildLocationNear(const CCTilePosition & p, co
//double ms1 = t.getElapsedTimeInMilliSec();
// iterate through the list until we've found a suitable location
- for (size_t i(0); i < closestToBuilding.size() && (i < 0 or i < search_count); ++i)
+ for (size_t i(0); i < closestToBuilding.size() && (search_count == 0 or i < search_count); ++i)
{
auto & pos = closestToBuilding[i];
diff --git a/src/BuildingPlacer.h b/src/BuildingPlacer.h
index 236e0f1..791d3d9 100644
--- a/src/BuildingPlacer.h
+++ b/src/BuildingPlacer.h
@@ -29,7 +29,7 @@ public:
bool canBuildHereWithSpace(int bx, int by, const UnitType & type, int buildDist) const;
// returns a build location near a building's desired location
- CCTilePosition getBuildLocationNear(const CCTilePosition & p, const UnitType & type, int buildDist, int search_count = 1000) const;
+ CCTilePosition getBuildLocationNear(const CCTilePosition & p, const UnitType & type, int buildDist, size_t search_count = 1000) const;
void drawReservedTiles();
--
GitLab