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

Change gClearSceneryCost to money64

Browse Source
This commit is contained in:
Gymnasiast
2021-07-27 17:59:49 +02:00
parent b42a097672
commit d7aa3906f1
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2-ui/windows/ClearScenery.cpp
View File

@@ -88,7 +88,7 @@ rct_window* window_clear_scenery_open()
window_push_others_below(window);
gLandToolSize = 2;
gClearSceneryCost = MONEY32_UNDEFINED;
gClearSceneryCost = MONEY64_UNDEFINED;
gClearSmallScenery = true;
gClearLargeScenery = false;
@@ -227,11 +227,12 @@ static void window_clear_scenery_paint(rct_window* w, rct_drawpixelinfo* dpi)
}
// Draw cost amount
if (gClearSceneryCost != MONEY32_UNDEFINED && gClearSceneryCost != 0 && !(gParkFlags & PARK_FLAGS_NO_MONEY))
if (gClearSceneryCost != MONEY64_UNDEFINED && gClearSceneryCost != 0 && !(gParkFlags & PARK_FLAGS_NO_MONEY))
{
money64 value = gClearSceneryCost;
auto ft = Formatter();
ft.Add<money64>(gClearSceneryCost);
screenCoords.x = window_clear_scenery_widgets[WIDX_PREVIEW].midX() + w->windowPos.x;
screenCoords.y = window_clear_scenery_widgets[WIDX_PREVIEW].bottom + w->windowPos.y + 5 + 27;
DrawTextBasic(dpi, screenCoords, STR_COST_AMOUNT, &value, { TextAlignment::CENTRE });
DrawTextBasic(dpi, screenCoords, STR_COST_AMOUNT, ft, { TextAlignment::CENTRE });
}
}

6
src/openrct2-ui/windows/TopToolbar.cpp
View File

@@ -1997,9 +1997,9 @@ static uint8_t top_toolbar_tool_update_land_paint(const ScreenCoordsXY& screenPo
if (!mapTile)
{
if (gClearSceneryCost != MONEY32_UNDEFINED)
if (gClearSceneryCost != MONEY64_UNDEFINED)
{
gClearSceneryCost = MONEY32_UNDEFINED;
gClearSceneryCost = MONEY64_UNDEFINED;
window_invalidate_by_class(WC_CLEAR_SCENERY);
}
return state_changed;
@@ -2067,7 +2067,7 @@ static void top_toolbar_tool_update_scenery_clear(const ScreenCoordsXY& screenPo
auto action = GetClearAction();
auto result = GameActions::Query(&action);
auto cost = (result->Error == GameActions::Status::Ok ? result->Cost : MONEY32_UNDEFINED);
auto cost = (result->Error == GameActions::Status::Ok ? result->Cost : MONEY64_UNDEFINED);
if (gClearSceneryCost != cost)
{
gClearSceneryCost = cost;

2
src/openrct2/world/Scenery.cpp
View File

@@ -51,7 +51,7 @@ int16_t gSceneryShiftPressZOffset;
int16_t gSceneryCtrlPressed;
int16_t gSceneryCtrlPressZ;
money32 gClearSceneryCost;
money64 gClearSceneryCost;
static std::vector<ScenerySelection> _restrictedScenery;

2
src/openrct2/world/Scenery.h
View File

@@ -277,7 +277,7 @@ extern int16_t gSceneryCtrlPressZ;
extern const CoordsXY SceneryQuadrantOffsets[];
extern money32 gClearSceneryCost;
extern money64 gClearSceneryCost;
void init_scenery();
void scenery_update_tile(const CoordsXY& sceneryPos);