From 40d097cd6333c543471bc3b40b5ef366783df419 Mon Sep 17 00:00:00 2001
From: GabrielTofvesson <gabriel.tofvesson@gmail.com>
Date: Tue, 11 Dec 2018 14:54:55 +0100
Subject: [PATCH] Replaced stray 'or' with ||

---
 src/BuildingPlacer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BuildingPlacer.cpp b/src/BuildingPlacer.cpp
index dfdfc96fc..f5394da16 100644
--- a/src/BuildingPlacer.cpp
+++ b/src/BuildingPlacer.cpp
@@ -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() && (search_count == 0 or i < search_count); ++i)
+    for (size_t i(0); i < closestToBuilding.size() && (search_count == 0 || i < search_count); ++i)
     {
         auto & pos = closestToBuilding[i];
 
-- 
GitLab