From 7a18fc4b96f777cbe29d94ae29a1ce7cc10c91aa Mon Sep 17 00:00:00 2001 From: Matt Date: Sun, 17 Feb 2019 10:02:18 +0100 Subject: [PATCH] Fix ClearAction breaking out of the loop too early. --- src/openrct2/actions/ClearAction.hpp | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/openrct2/actions/ClearAction.hpp b/src/openrct2/actions/ClearAction.hpp index 2f30df8a9f..031895f193 100644 --- a/src/openrct2/actions/ClearAction.hpp +++ b/src/openrct2/actions/ClearAction.hpp @@ -158,11 +158,11 @@ private: auto res = executing ? GameActions::ExecuteNested(&footpathRemoveAction) : GameActions::QueryNested(&footpathRemoveAction); - if (res->Error != GA_ERROR::OK) - return MONEY32_UNDEFINED; - - totalCost += res->Cost; - tileEdited = executing; + if (res->Error == GA_ERROR::OK) + { + totalCost += res->Cost; + tileEdited = executing; + } } break; case TILE_ELEMENT_TYPE_SMALL_SCENERY: @@ -176,11 +176,11 @@ private: auto res = executing ? GameActions::ExecuteNested(&removeSceneryAction) : GameActions::QueryNested(&removeSceneryAction); - if (res->Error != GA_ERROR::OK) - return MONEY32_UNDEFINED; - - totalCost += res->Cost; - tileEdited = executing; + if (res->Error == GA_ERROR::OK) + { + totalCost += res->Cost; + tileEdited = executing; + } } break; case TILE_ELEMENT_TYPE_WALL: @@ -193,11 +193,11 @@ private: auto res = executing ? GameActions::ExecuteNested(&wallRemoveAction) : GameActions::QueryNested(&wallRemoveAction); - if (res->Error != GA_ERROR::OK) - return MONEY32_UNDEFINED; - - totalCost += res->Cost; - tileEdited = executing; + if (res->Error == GA_ERROR::OK) + { + totalCost += res->Cost; + tileEdited = executing; + } } break; case TILE_ELEMENT_TYPE_LARGE_SCENERY: @@ -211,11 +211,11 @@ private: auto res = executing ? GameActions::ExecuteNested(&removeSceneryAction) : GameActions::QueryNested(&removeSceneryAction); - if (res->Error != GA_ERROR::OK) - return MONEY32_UNDEFINED; - - totalCost += res->Cost; - tileEdited = executing; + if (res->Error == GA_ERROR::OK) + { + totalCost += res->Cost; + tileEdited = executing; + } } break; }