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

Minor cleanups (#14954)

Browse Source 
* Fix uninitialized variables in InputManager

* Use constexpr for const values

* Add break statements instead of implicit fallthrough

* Default initialize variables in Cheats window

* Default initialize variables in News window

* Default initialize window event pointers
This commit is contained in:
ζeh Matt
2021-06-26 07:43:05 +03:00
committed by GitHub
parent 54d70ec52d
commit 751c419594
9 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/input/InputManager.h
View File

@@ -46,11 +46,11 @@ namespace OpenRCT2::Ui
class InputManager
{
private:
uint32_t _lastJoystickCheck;
uint32_t _lastJoystickCheck{};
std::vector<SDL_Joystick*> _joysticks;
std::queue<InputEvent> _events;
ScreenCoordsXY _viewScroll;
uint32_t _mouseState;
uint32_t _mouseState{};
std::vector<uint8_t> _keyboardState;
void CheckJoysticks();

3
src/openrct2-ui/interface/ViewportInteraction.cpp
View File

@@ -253,7 +253,8 @@ InteractionInfo ViewportInteractionGetItemRight(const ScreenCoordsXY& screenCoor
if ((gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) && gS6Info.editor_step != EditorStep::RollercoasterDesigner)
return info;
auto flags = static_cast<int32_t>(~EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water));
constexpr auto flags = static_cast<int32_t>(
~EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water));
info = get_map_coordinates_from_pos(screenCoords, flags);
auto tileElement = info.Element;

2
src/openrct2-ui/windows/Cheats.cpp
View File

@@ -446,7 +446,7 @@ static rct_string_id window_cheats_page_titles[] = {
class CheatsWindow final : public Window
{
private:
char _moneySpinnerText[MONEY_STRING_MAXLENGTH];
char _moneySpinnerText[MONEY_STRING_MAXLENGTH]{};
money32 _moneySpinnerValue = CHEATS_MONEY_DEFAULT;
int32_t _selectedStaffSpeed = 1;
int32_t _parkRatingSpinnerValue{};

2
src/openrct2-ui/windows/News.cpp
View File

@@ -44,7 +44,7 @@ static rct_widget window_news_widgets[] = {
class NewsWindow final : public Window
{
private:
int32_t _pressedNewsItemIndex, _pressedButtonIndex, _suspendUpdateTicks;
int32_t _pressedNewsItemIndex{}, _pressedButtonIndex{}, _suspendUpdateTicks{};
static int32_t CalculateItemHeight()
{
return 4 * font_get_line_height(FontSpriteBase::SMALL) + 2;

2
src/openrct2-ui/windows/Options.cpp
View File

@@ -1128,7 +1128,7 @@ static void window_options_culture_mousedown(rct_window* w, rct_widgetindex widg
break;
case WIDX_CURRENCY_DROPDOWN:
{
uint32_t num_items = EnumValue(CurrencyType::Count) + 1; // All the currencies plus the separator
constexpr auto num_items = EnumValue(CurrencyType::Count) + 1; // All the currencies plus the separator
size_t num_ordinary_currencies = EnumValue(CurrencyType::Count) - 1; // All the currencies except custom currency
for (size_t i = 0; i < num_ordinary_currencies; i++)

2
src/openrct2-ui/windows/Ride.cpp
View File

@@ -5414,7 +5414,7 @@ static void window_ride_measurements_tooldown(rct_window* w, rct_widgetindex wid
_lastSceneryY = screenCoords.y;
_collectTrackDesignScenery = true; // Default to true in case user does not select anything valid
auto flags = EnumsToFlags(
constexpr auto flags = EnumsToFlags(
ViewportInteractionItem::Scenery, ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall,
ViewportInteractionItem::LargeScenery);
auto info = get_map_coordinates_from_pos(screenCoords, flags);

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

@@ -1167,7 +1167,7 @@ static void sub_6E1F34_update_screen_coords_and_buttons_pressed(bool canRaiseIte
if (InputTestPlaceObjectModifier(PLACE_OBJECT_MODIFIER_COPY_Z))
{
// CTRL pressed
auto flags = EnumsToFlags(
constexpr auto flags = EnumsToFlags(
ViewportInteractionItem::Terrain, ViewportInteractionItem::Ride, ViewportInteractionItem::Scenery,
ViewportInteractionItem::Footpath, ViewportInteractionItem::Wall, ViewportInteractionItem::LargeScenery);
auto info = get_map_coordinates_from_pos(screenPos, flags);
@@ -1337,7 +1337,7 @@ static void sub_6E1F34_small_scenery(
// If CTRL not pressed
if (!gSceneryCtrlPressed)
{
auto flags = EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water);
constexpr auto flags = EnumsToFlags(ViewportInteractionItem::Terrain, ViewportInteractionItem::Water);
auto info = get_map_coordinates_from_pos(screenPos, flags);
gridPos = info.Loc;
@@ -1431,7 +1431,7 @@ static void sub_6E1F34_path_item(
sub_6E1F34_update_screen_coords_and_buttons_pressed(false, screenPos);
// Path bits
auto flags = EnumsToFlags(ViewportInteractionItem::Footpath, ViewportInteractionItem::FootpathItem);
constexpr auto flags = EnumsToFlags(ViewportInteractionItem::Footpath, ViewportInteractionItem::FootpathItem);
auto info = get_map_coordinates_from_pos(screenPos, flags);
gridPos = info.Loc;
@@ -1653,7 +1653,7 @@ static void sub_6E1F34_banner(
sub_6E1F34_update_screen_coords_and_buttons_pressed(false, screenPos);
// Banner
auto flags = EnumsToFlags(ViewportInteractionItem::Footpath, ViewportInteractionItem::FootpathItem);
constexpr auto flags = EnumsToFlags(ViewportInteractionItem::Footpath, ViewportInteractionItem::FootpathItem);
auto info = get_map_coordinates_from_pos(screenPos, flags);
gridPos = info.Loc;

56
src/openrct2/interface/Window.h
View File

@@ -244,34 +244,34 @@ struct viewport_focus
struct rct_window_event_list
{
void (*close)(struct rct_window*);
void (*mouse_up)(struct rct_window*, rct_widgetindex);
void (*resize)(struct rct_window*);
void (*mouse_down)(struct rct_window*, rct_widgetindex, rct_widget*);
void (*dropdown)(struct rct_window*, rct_widgetindex, int32_t);
void (*unknown_05)(struct rct_window*);
void (*update)(struct rct_window*);
void (*periodic_update)(struct rct_window*);
void (*unknown_08)(struct rct_window*);
void (*tool_update)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&);
void (*tool_down)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&);
void (*tool_drag)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&);
void (*tool_up)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&);
void (*tool_abort)(struct rct_window*, rct_widgetindex);
void (*unknown_0E)(struct rct_window*);
void (*get_scroll_size)(struct rct_window*, int32_t, int32_t*, int32_t*);
void (*scroll_mousedown)(struct rct_window*, int32_t, const ScreenCoordsXY&);
void (*scroll_mousedrag)(struct rct_window*, int32_t, const ScreenCoordsXY&);
void (*scroll_mouseover)(struct rct_window*, int32_t, const ScreenCoordsXY&);
void (*text_input)(struct rct_window*, rct_widgetindex, char*);
void (*viewport_rotate)(struct rct_window*);
void (*unknown_15)(struct rct_window*, int32_t, int32_t);
OpenRCT2String (*tooltip)(struct rct_window*, const rct_widgetindex, const rct_string_id);
void (*cursor)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&, CursorID*);
void (*moved)(struct rct_window*, const ScreenCoordsXY&);
void (*invalidate)(struct rct_window*);
void (*paint)(struct rct_window*, rct_drawpixelinfo*);
void (*scroll_paint)(struct rct_window*, rct_drawpixelinfo*, int32_t);
void (*close)(struct rct_window*){};
void (*mouse_up)(struct rct_window*, rct_widgetindex){};
void (*resize)(struct rct_window*){};
void (*mouse_down)(struct rct_window*, rct_widgetindex, rct_widget*){};
void (*dropdown)(struct rct_window*, rct_widgetindex, int32_t){};
void (*unknown_05)(struct rct_window*){};
void (*update)(struct rct_window*){};
void (*periodic_update)(struct rct_window*){};
void (*unknown_08)(struct rct_window*){};
void (*tool_update)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&){};
void (*tool_down)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&){};
void (*tool_drag)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&){};
void (*tool_up)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&){};
void (*tool_abort)(struct rct_window*, rct_widgetindex){};
void (*unknown_0E)(struct rct_window*){};
void (*get_scroll_size)(struct rct_window*, int32_t, int32_t*, int32_t*){};
void (*scroll_mousedown)(struct rct_window*, int32_t, const ScreenCoordsXY&){};
void (*scroll_mousedrag)(struct rct_window*, int32_t, const ScreenCoordsXY&){};
void (*scroll_mouseover)(struct rct_window*, int32_t, const ScreenCoordsXY&){};
void (*text_input)(struct rct_window*, rct_widgetindex, char*){};
void (*viewport_rotate)(struct rct_window*){};
void (*unknown_15)(struct rct_window*, int32_t, int32_t){};
OpenRCT2String (*tooltip)(struct rct_window*, const rct_widgetindex, const rct_string_id){};
void (*cursor)(struct rct_window*, rct_widgetindex, const ScreenCoordsXY&, CursorID*){};
void (*moved)(struct rct_window*, const ScreenCoordsXY&){};
void (*invalidate)(struct rct_window*){};
void (*paint)(struct rct_window*, rct_drawpixelinfo*){};
void (*scroll_paint)(struct rct_window*, rct_drawpixelinfo*, int32_t){};
typedef void (*fnEventInitializer)(rct_window_event_list&);
rct_window_event_list(fnEventInitializer fn)

2
src/openrct2/paint/Paint.cpp
View File

@@ -649,6 +649,7 @@ static uint32_t PaintPSColourifyImage(uint32_t imageId, ViewportInteractionItem
case ViewportInteractionItem::Banner:
imageId &= 0x7FFFF;
imageId |= seeThoughFlags;
break;
default:
break;
}
@@ -662,6 +663,7 @@ static uint32_t PaintPSColourifyImage(uint32_t imageId, ViewportInteractionItem
case ViewportInteractionItem::Wall:
imageId &= 0x7FFFF;
imageId |= seeThoughFlags;
break;
default:
break;
}