mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Fix ClearAction breaking out of the loop too early.

Browse Source
This commit is contained in:
Matt
2019-02-17 10:02:18 +01:00
parent 597b0956fc
commit 7a18fc4b96
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/openrct2/actions/ClearAction.hpp
View File

@@ -158,11 +158,11 @@ private:
auto res = executing ? GameActions::ExecuteNested(&footpathRemoveAction) auto res = executing ? GameActions::ExecuteNested(&footpathRemoveAction)
: GameActions::QueryNested(&footpathRemoveAction); : GameActions::QueryNested(&footpathRemoveAction);
if (res->Error != GA_ERROR::OK) if (res->Error == GA_ERROR::OK)
return MONEY32_UNDEFINED; {
totalCost += res->Cost;
totalCost += res->Cost; tileEdited = executing;
tileEdited = executing; }
} }
break; break;
case TILE_ELEMENT_TYPE_SMALL_SCENERY: case TILE_ELEMENT_TYPE_SMALL_SCENERY:
@@ -176,11 +176,11 @@ private:
auto res = executing ? GameActions::ExecuteNested(&removeSceneryAction) auto res = executing ? GameActions::ExecuteNested(&removeSceneryAction)
: GameActions::QueryNested(&removeSceneryAction); : GameActions::QueryNested(&removeSceneryAction);
if (res->Error != GA_ERROR::OK) if (res->Error == GA_ERROR::OK)
return MONEY32_UNDEFINED; {
totalCost += res->Cost;
totalCost += res->Cost; tileEdited = executing;
tileEdited = executing; }
} }
break; break;
case TILE_ELEMENT_TYPE_WALL: case TILE_ELEMENT_TYPE_WALL:
@@ -193,11 +193,11 @@ private:
auto res = executing ? GameActions::ExecuteNested(&wallRemoveAction) auto res = executing ? GameActions::ExecuteNested(&wallRemoveAction)
: GameActions::QueryNested(&wallRemoveAction); : GameActions::QueryNested(&wallRemoveAction);
if (res->Error != GA_ERROR::OK) if (res->Error == GA_ERROR::OK)
return MONEY32_UNDEFINED; {
totalCost += res->Cost;
totalCost += res->Cost; tileEdited = executing;
tileEdited = executing; }
} }
break; break;
case TILE_ELEMENT_TYPE_LARGE_SCENERY: case TILE_ELEMENT_TYPE_LARGE_SCENERY:
@@ -211,11 +211,11 @@ private:
auto res = executing ? GameActions::ExecuteNested(&removeSceneryAction) auto res = executing ? GameActions::ExecuteNested(&removeSceneryAction)
: GameActions::QueryNested(&removeSceneryAction); : GameActions::QueryNested(&removeSceneryAction);
if (res->Error != GA_ERROR::OK) if (res->Error == GA_ERROR::OK)
return MONEY32_UNDEFINED; {
totalCost += res->Cost;
totalCost += res->Cost; tileEdited = executing;
tileEdited = executing; }
} }
break; break;
} }