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

Change CloseWindowModifier members to new codestyle

Browse Source
This commit is contained in:
Gymnasiast
2025-03-01 15:48:51 +01:00
parent 17140192de
commit 9982f74cb7
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/input/MouseInput.cpp
View File

@@ -1326,13 +1326,13 @@ namespace OpenRCT2
{
gLastCloseModifier.window.number = w->number;
gLastCloseModifier.window.classification = w->classification;
gLastCloseModifier.modifier = CloseWindowModifier::Shift;
gLastCloseModifier.modifier = CloseWindowModifier::shift;
}
else if (im.IsModifierKeyPressed(ModifierKey::ctrl))
{
gLastCloseModifier.window.number = w->number;
gLastCloseModifier.window.classification = w->classification;
gLastCloseModifier.modifier = CloseWindowModifier::Control;
gLastCloseModifier.modifier = CloseWindowModifier::control;
}
}
}

8
src/openrct2-ui/interface/Window.cpp
View File

@@ -421,11 +421,11 @@ namespace OpenRCT2
{
CloseWindowModifier modifier = GetCloseModifier();
if (modifier == CloseWindowModifier::Shift)
if (modifier == CloseWindowModifier::shift)
{
CloseOthers();
}
else if (modifier == CloseWindowModifier::Control)
else if (modifier == CloseWindowModifier::control)
{
CloseOthersOfThisClass();
}
@@ -450,14 +450,14 @@ namespace OpenRCT2
CloseWindowModifier Window::GetCloseModifier()
{
CloseWindowModifier lastModifier = CloseWindowModifier::None;
CloseWindowModifier lastModifier = CloseWindowModifier::none;
if (gLastCloseModifier.window.number == number && gLastCloseModifier.window.classification == classification)
{
lastModifier = gLastCloseModifier.modifier;
}
gLastCloseModifier.modifier = CloseWindowModifier::None;
gLastCloseModifier.modifier = CloseWindowModifier::none;
return lastModifier;
}

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

@@ -39,7 +39,7 @@ namespace OpenRCT2
std::list<std::shared_ptr<WindowBase>> g_window_list;
WindowBase* gWindowAudioExclusive;
WindowCloseModifier gLastCloseModifier = { { WindowClass::Null, 0 }, CloseWindowModifier::None };
WindowCloseModifier gLastCloseModifier = { { WindowClass::Null, 0 }, CloseWindowModifier::none };
uint32_t gWindowUpdateTicks;
colour_t gCurrentWindowColours[3];

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

@@ -241,9 +241,9 @@ enum class VisibilityCache : uint8_t
enum class CloseWindowModifier : uint8_t
{
None,
Shift,
Control
none,
shift,
control
};
enum class GuestListFilterType : int32_t