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

Add extra checks to verify the widget belongs to a toolsize or stepper

Browse Source 
It's possible that widgets are arranged in such a way that the roder of buttons matches the order of tool-size widgets or steppers. Now instead of just checking the types, also their content will be checked.
This commit is contained in:
Hielke Morsink
2018-06-04 15:48:12 +02:00
parent 32c4dab6c8
commit cb1c55def5
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@
#include "../OpenRCT2.h" #include "../OpenRCT2.h"
#include "../platform/platform.h" #include "../platform/platform.h"
#include "../scenario/Scenario.h" #include "../scenario/Scenario.h"
#include "../sprites.h"
#include "../world/Map.h" #include "../world/Map.h"
#include "../world/Sprite.h" #include "../world/Sprite.h"
#include "Viewport.h" #include "Viewport.h"
@@ -292,34 +293,36 @@ static bool window_other_wheel_input(rct_window* w, rct_widgetindex widgetIndex,
} }
rct_widgetindex buttonWidgetIndex; rct_widgetindex buttonWidgetIndex;
if (widgetType == WWT_IMGBTN) uint16 expectedType;
uint32 expectedContent[2];
switch (widgetType)
{ {
buttonWidgetIndex = wheel < 0 ? widgetIndex + 2 : widgetIndex + 1; case WWT_IMGBTN:
buttonWidgetIndex = wheel < 0 ? widgetIndex + 2 : widgetIndex + 1;
// For previews, the - and + buttons are expected to be of type WWT_TRNBTN expectedType = WWT_TRNBTN;
auto buttonType = w->widgets[buttonWidgetIndex].type; expectedContent[0] = IMAGE_TYPE_REMAP | SPR_LAND_TOOL_DECREASE;
if (buttonType != WWT_TRNBTN) expectedContent[1] = IMAGE_TYPE_REMAP | SPR_LAND_TOOL_INCREASE;
{ break;
return false; case WWT_STEPPER:
} buttonWidgetIndex = wheel < 0 ? widgetIndex + 1 : widgetIndex + 2;
expectedType = WWT_BUTTON;
expectedContent[0] = STR_NUMERIC_UP;
expectedContent[1] = STR_NUMERIC_DOWN;
break;
default: return false;
} }
else if (widgetType == WWT_STEPPER)
{
buttonWidgetIndex = wheel < 0 ? widgetIndex + 1 : widgetIndex + 2;
// For steppers, the - and + buttons are expected to be of type WWT_BUTTON if (widget_is_disabled(w, buttonWidgetIndex))
auto buttonType = w->widgets[buttonWidgetIndex].type;
if (buttonType != WWT_BUTTON)
{
return false;
}
}
else
{ {
return false; return false;
} }
if (widget_is_disabled(w, buttonWidgetIndex)) auto button1Type = w->widgets[widgetIndex + 1].type;
auto button1Image = w->widgets[widgetIndex + 1].image;
auto button2Type = w->widgets[widgetIndex + 2].type;
auto button2Image = w->widgets[widgetIndex + 2].image;
if (button1Type != expectedType || button2Type != expectedType || button1Image != expectedContent[0]
|| button2Image != expectedContent[1])
{ {
return false; return false;
} }