mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 15:24:30 +01:00
Code Issues Releases Wiki Activity

Change GameState_t members to lowerCamelCase

Browse Source
This commit is contained in:
Gymnasiast
2025-03-20 19:47:53 +01:00
parent eb30d3c054
commit 4badffcdb6
179 changed files with 2619 additions and 2619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/openrct2/interface/Screenshot.cpp
View File

@@ -112,7 +112,7 @@ void ScreenshotCheck()
static std::string ScreenshotGetParkName()
{
return GetGameState().Park.Name;
return getGameState().park.Name;
}
static std::string ScreenshotGetDirectory()
@@ -257,25 +257,25 @@ static void ReleaseDPI(DrawPixelInfo& dpi)
static Viewport GetGiantViewport(int32_t rotation, ZoomLevel zoom)
{
auto& gameState = GetGameState();
auto& gameState = getGameState();
// Get the tile coordinates of each corner
const TileCoordsXY cornerCoords[2][4] = {
{
// Map corners
{ 1, 1 },
{ gameState.MapSize.x - 2, gameState.MapSize.y - 2 },
{ 1, gameState.MapSize.y - 2 },
{ gameState.MapSize.x - 2, 1 },
{ gameState.mapSize.x - 2, gameState.mapSize.y - 2 },
{ 1, gameState.mapSize.y - 2 },
{ gameState.mapSize.x - 2, 1 },
},
{
// Horizontal view clipping corners
TileCoordsXY{ CoordsXY{ std::max(gClipSelectionA.x, 32), std::max(gClipSelectionA.y, 32) } },
TileCoordsXY{ CoordsXY{ std::min(gClipSelectionB.x, (gameState.MapSize.x - 2) * 32),
std::min(gClipSelectionB.y, (gameState.MapSize.y - 2) * 32) } },
TileCoordsXY{ CoordsXY{ std::min(gClipSelectionB.x, (gameState.mapSize.x - 2) * 32),
std::min(gClipSelectionB.y, (gameState.mapSize.y - 2) * 32) } },
TileCoordsXY{
CoordsXY{ std::max(gClipSelectionA.x, 32), std::min(gClipSelectionB.y, (gameState.MapSize.y - 2) * 32) } },
CoordsXY{ std::max(gClipSelectionA.x, 32), std::min(gClipSelectionB.y, (gameState.mapSize.y - 2) * 32) } },
TileCoordsXY{
CoordsXY{ std::min(gClipSelectionB.x, (gameState.MapSize.x - 2) * 32), std::max(gClipSelectionA.y, 32) } },
CoordsXY{ std::min(gClipSelectionB.x, (gameState.mapSize.x - 2) * 32), std::max(gClipSelectionA.y, 32) } },
},
};
@@ -500,7 +500,7 @@ int32_t CommandLineForScreenshot(const char** argv, int32_t argc, ScreenshotOpti
customRotation = std::atoi(argv[7]) & 3;
}
const auto& mapSize = GetGameState().MapSize;
const auto& mapSize = getGameState().mapSize;
if (resolutionWidth == 0 || resolutionHeight == 0)
{
resolutionWidth = (mapSize.x * kCoordsXYStep * 2) >> customZoom;
@@ -531,11 +531,11 @@ int32_t CommandLineForScreenshot(const char** argv, int32_t argc, ScreenshotOpti
}
else
{
auto& gameState = GetGameState();
viewport.viewPos = { gameState.SavedView
auto& gameState = getGameState();
viewport.viewPos = { gameState.savedView
- ScreenCoordsXY{ (viewport.ViewWidth() / 2), (viewport.ViewHeight() / 2) } };
viewport.zoom = gameState.SavedViewZoom;
viewport.rotation = gameState.SavedViewRotation;
viewport.zoom = gameState.savedViewZoom;
viewport.rotation = gameState.savedViewRotation;
}
}