mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-02 03:35:09 +01:00
Code Issues Releases Wiki Activity

Get scripting compiling on clang

Browse Source
This commit is contained in:
Ted John
2020-02-23 15:33:01 +00:00
parent bac91cd563
commit e6341f0a42
49 changed files with 282 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/openrct2-ui/scripting/CustomWindow.cpp
View File

@@ -229,21 +229,14 @@ namespace OpenRCT2::Ui::Windows
class CustomWindowInfo
{
private:
rct_windowclass _class;
rct_windownumber _number;
public:
std::shared_ptr<Plugin> Owner;
CustomWindowDesc Desc;
std::vector<rct_widget> Widgets;
std::vector<size_t> WidgetIndexMap;
CustomWindowInfo(
rct_windowclass cls, rct_windownumber number, std::shared_ptr<Plugin> owner, const CustomWindowDesc& desc)
: _class(cls)
, _number(number)
, Owner(owner)
CustomWindowInfo(std::shared_ptr<Plugin> owner, const CustomWindowDesc& desc)
: Owner(owner)
, Desc(desc)
{
}
@@ -300,7 +293,7 @@ namespace OpenRCT2::Ui::Windows
}
window->number = GetNewWindowNumber();
window->custom_info = new CustomWindowInfo(window->classification, window->number, owner, desc);
window->custom_info = new CustomWindowInfo(owner, desc);
window->enabled_widgets = (1 << WIDX_CLOSE);
window->colours[0] = COLOUR_GREY;
window->colours[1] = COLOUR_GREY;