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

Make uses of window_get_main use (const) auto*

Browse Source
This commit is contained in:
Hielke Morsink
2021-09-30 14:34:07 +02:00
parent bb5d09982f
commit 429e34d7f3
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/Game.cpp
View File

@@ -531,7 +531,7 @@ void game_load_init()
} }
else else
{ {
const auto mainWindow = window_get_main(); auto* mainWindow = window_get_main();
window_unfollow_sprite(mainWindow); window_unfollow_sprite(mainWindow);
} }

2
src/openrct2/drawing/Weather.cpp
View File

@@ -53,7 +53,7 @@ void DrawWeather(rct_drawpixelinfo* dpi, IWeatherDrawer* weatherDrawer)
{ {
uint32_t viewFlags = 0; uint32_t viewFlags = 0;
rct_viewport* viewport = window_get_viewport(window_get_main()); const auto* viewport = window_get_viewport(window_get_main());
if (viewport != nullptr) if (viewport != nullptr)
viewFlags = viewport->flags; viewFlags = viewport->flags;

12
src/openrct2/interface/Window.cpp
View File

@@ -1086,7 +1086,7 @@ void main_window_zoom(bool zoomIn, bool atCursor)
{ {
if (!(gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)) if (!(gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER))
{ {
rct_window* mainWindow = window_get_main(); auto* mainWindow = window_get_main();
if (mainWindow != nullptr) if (mainWindow != nullptr)
window_zoom_set(mainWindow, mainWindow->viewport->zoom + (zoomIn ? -1 : 1), atCursor); window_zoom_set(mainWindow, mainWindow->viewport->zoom + (zoomIn ? -1 : 1), atCursor);
} }
@@ -1706,7 +1706,7 @@ void window_resize_gui(int32_t width, int32_t height)
*/ */
void window_resize_gui_scenario_editor(int32_t width, int32_t height) void window_resize_gui_scenario_editor(int32_t width, int32_t height)
{ {
rct_window* mainWind = window_get_main(); auto* mainWind = window_get_main();
if (mainWind != nullptr) if (mainWind != nullptr)
{ {
rct_viewport* viewport = mainWind->viewport; rct_viewport* viewport = mainWind->viewport;
@@ -1797,7 +1797,7 @@ void window_update_viewport_ride_music()
static void window_snap_left(rct_window* w, int32_t proximity) static void window_snap_left(rct_window* w, int32_t proximity)
{ {
auto mainWindow = window_get_main(); const auto* mainWindow = window_get_main();
auto wBottom = w->windowPos.y + w->height; auto wBottom = w->windowPos.y + w->height;
auto wLeftProximity = w->windowPos.x - (proximity * 2); auto wLeftProximity = w->windowPos.x - (proximity * 2);
auto wRightProximity = w->windowPos.x + (proximity * 2); auto wRightProximity = w->windowPos.x + (proximity * 2);
@@ -1827,7 +1827,7 @@ static void window_snap_left(rct_window* w, int32_t proximity)
static void window_snap_top(rct_window* w, int32_t proximity) static void window_snap_top(rct_window* w, int32_t proximity)
{ {
auto mainWindow = window_get_main(); const auto* mainWindow = window_get_main();
auto wRight = w->windowPos.x + w->width; auto wRight = w->windowPos.x + w->width;
auto wTopProximity = w->windowPos.y - (proximity * 2); auto wTopProximity = w->windowPos.y - (proximity * 2);
auto wBottomProximity = w->windowPos.y + (proximity * 2); auto wBottomProximity = w->windowPos.y + (proximity * 2);
@@ -1857,7 +1857,7 @@ static void window_snap_top(rct_window* w, int32_t proximity)
static void window_snap_right(rct_window* w, int32_t proximity) static void window_snap_right(rct_window* w, int32_t proximity)
{ {
auto mainWindow = window_get_main(); const auto* mainWindow = window_get_main();
auto wRight = w->windowPos.x + w->width; auto wRight = w->windowPos.x + w->width;
auto wBottom = w->windowPos.y + w->height; auto wBottom = w->windowPos.y + w->height;
auto wLeftProximity = wRight - (proximity * 2); auto wLeftProximity = wRight - (proximity * 2);
@@ -1887,7 +1887,7 @@ static void window_snap_right(rct_window* w, int32_t proximity)
static void window_snap_bottom(rct_window* w, int32_t proximity) static void window_snap_bottom(rct_window* w, int32_t proximity)
{ {
auto mainWindow = window_get_main(); const auto* mainWindow = window_get_main();
auto wRight = w->windowPos.x + w->width; auto wRight = w->windowPos.x + w->width;
auto wBottom = w->windowPos.y + w->height; auto wBottom = w->windowPos.y + w->height;
auto wTopProximity = wBottom - (proximity * 2); auto wTopProximity = wBottom - (proximity * 2);

4
src/openrct2/ride/Ride.cpp
View File

@@ -3704,7 +3704,7 @@ static bool ride_create_cable_lift(ride_id_t rideIndex, bool isApplying)
*/ */
void Ride::ConstructMissingEntranceOrExit() const void Ride::ConstructMissingEntranceOrExit() const
{ {
rct_window* w = window_get_main(); auto* w = window_get_main();
if (w == nullptr) if (w == nullptr)
return; return;
@@ -3757,7 +3757,7 @@ void Ride::ConstructMissingEntranceOrExit() const
*/ */
static void ride_scroll_to_track_error(CoordsXYE* trackElement) static void ride_scroll_to_track_error(CoordsXYE* trackElement)
{ {
rct_window* w = window_get_main(); auto* w = window_get_main();
if (w != nullptr) if (w != nullptr)
{ {
window_scroll_to_location(w, { *trackElement, trackElement->element->GetBaseZ() }); window_scroll_to_location(w, { *trackElement, trackElement->element->GetBaseZ() });