mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update UI imports

This commit is contained in:
Marijn van der Werf 2018-01-03 00:13:37 +01:00 committed by Aaron van Geffen
parent 738b72d0ce
commit 4c956def67
86 changed files with 179 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRCT2.xcodeproj/project.pbxproj
View File

@ -298,6 +298,9 @@
C666EE7D1F37ACB10061AA04 /* TitleMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE671F37ACB10061AA04 /* TitleMenu.cpp */; };
C666EE7E1F37ACB10061AA04 /* TitleOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE681F37ACB10061AA04 /* TitleOptions.cpp */; };
C666EE7F1F37ACB10061AA04 /* Viewport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE691F37ACB10061AA04 /* Viewport.cpp */; };
C67B28152002D67A00109C93 /* Widget.h in Headers */ = {isa = PBXBuildFile; fileRef = C67B28122002D67900109C93 /* Widget.h */; };
C67B28162002D67A00109C93 /* Window.h in Headers */ = {isa = PBXBuildFile; fileRef = C67B28132002D67900109C93 /* Window.h */; };
C67B28172002D67A00109C93 /* Viewport.h in Headers */ = {isa = PBXBuildFile; fileRef = C67B28142002D67900109C93 /* Viewport.h */; };
C67CCD661FBBCFDB004FAE4C /* EditorBottomToolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C67CCD651FBBCFDB004FAE4C /* EditorBottomToolbar.cpp */; };
C67CCD681FBBD138004FAE4C /* EditorMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C67CCD671FBBD137004FAE4C /* EditorMain.cpp */; };
C68313C61FDB4EBA006DB3D8 /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C68313C51FDB4EBA006DB3D8 /* input.cpp */; };
@ -983,6 +986,9 @@
C666EE681F37ACB10061AA04 /* TitleOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TitleOptions.cpp; sourceTree = "<group>"; };
C666EE691F37ACB10061AA04 /* Viewport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Viewport.cpp; sourceTree = "<group>"; };
C666EE6A1F37ACB10061AA04 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
C67B28122002D67900109C93 /* Widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Widget.h; sourceTree = "<group>"; };
C67B28132002D67900109C93 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
C67B28142002D67900109C93 /* Viewport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Viewport.h; sourceTree = "<group>"; };
C67CCD651FBBCFDB004FAE4C /* EditorBottomToolbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorBottomToolbar.cpp; sourceTree = "<group>"; };
C67CCD671FBBD137004FAE4C /* EditorMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorMain.cpp; sourceTree = "<group>"; };
C68313C51FDB4EBA006DB3D8 /* input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = input.cpp; sourceTree = "<group>"; };
@ -1534,6 +1540,9 @@
C68313D21FDB4F4C006DB3D8 /* Graph.h */,
C68313D31FDB4F4C006DB3D8 /* LandTool.cpp */,
C68313D41FDB4F4C006DB3D8 /* LandTool.h */,
C67B28142002D67900109C93 /* Viewport.h */,
C67B28122002D67900109C93 /* Widget.h */,
C67B28132002D67900109C93 /* Window.h */,
);
path = interface;
sourceTree = "<group>";
@ -2756,6 +2765,8 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
C67B28172002D67A00109C93 /* Viewport.h in Headers */,
C67B28152002D67A00109C93 /* Widget.h in Headers */,
C6352B951F477032006CCEE3 /* RideCreateAction.hpp in Headers */,
C6352B851F477022006CCEE3 /* DataSerialiserTraits.h in Headers */,
C6352B971F477032006CCEE3 /* SetParkEntranceFeeAction.hpp in Headers */,
@ -2764,6 +2775,7 @@
C6352B911F477032006CCEE3 /* GameAction.h in Headers */,
C62D838B1FD36D6F008C04F1 /* EditorObjectSelectionSession.h in Headers */,
C6352B841F477022006CCEE3 /* DataSerialiser.h in Headers */,
C67B28162002D67A00109C93 /* Window.h in Headers */,
C6352B961F477032006CCEE3 /* RideSetStatus.hpp in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;

2
src/openrct2-ui/TextComposition.cpp
View File

@ -22,7 +22,7 @@
#include "TextComposition.h"
#include <openrct2/interface/Console.h>
#include <openrct2/interface/Window.h>
#include <openrct2-ui/interface/Window.h>
#include <openrct2/localisation/Localisation.h>
#ifdef __MACOSX__

2
src/openrct2-ui/UiContext.cpp
View File

@ -42,7 +42,7 @@
#include <openrct2/Input.h>
#include <openrct2/interface/Console.h>
#include <openrct2/interface/Window.h>
#include <openrct2-ui/interface/Window.h>
using namespace OpenRCT2;
using namespace OpenRCT2::Drawing;

2
src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
View File

@ -30,7 +30,7 @@
#include <openrct2/interface/Screenshot.h>
#include <openrct2/ui/UiContext.h>
#include <openrct2/interface/Window.h>
#include <openrct2-ui/interface/Window.h>
#include <openrct2/Intro.h>
#include <openrct2/drawing/Drawing.h>
#include <openrct2/drawing/LightFX.h>

6
src/openrct2-ui/input/KeyboardShortcut.cpp
View File

@ -24,9 +24,9 @@
#include <openrct2/Input.h>
#include <openrct2/interface/Screenshot.h>
#include <openrct2/interface/Chat.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2/interface/Window.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2-ui/interface/Window.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/network/network.h>
#include <openrct2/platform/platform.h>

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

@ -27,9 +27,9 @@
#include <openrct2/interface/Cursors.h>
#include <openrct2/interface/Chat.h>
#include <openrct2/interface/Console.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2/interface/Window.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2-ui/interface/Window.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/platform/platform.h>
#include <openrct2/ride/RideData.h>

2
src/openrct2-ui/interface/Dropdown.h
View File

@ -17,7 +17,7 @@
#pragma once
#include <openrct2/common.h>
#include <openrct2/interface/Window.h>
#include <openrct2-ui/interface/Window.h>
#define DROPDOWN_SEPARATOR 0
#define DROPDOWN_FORMAT_COLOUR_PICKER 0xFFFE

4
src/openrct2-ui/interface/LandTool.cpp
View File

@ -17,8 +17,8 @@
#include <openrct2-ui/interface/Dropdown.h>
#include <openrct2/world/Map.h>
#include <openrct2-ui/interface/LandTool.h>
#include <openrct2/interface/Widget.h>
#include <openrct2/interface/Window.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2-ui/interface/Window.h>
static uint16 toolSizeSpriteIndices[] =
{

2
src/openrct2-ui/interface/LandTool.h
View File

@ -18,7 +18,7 @@
#include <openrct2/common.h>
#include <openrct2/sprites.h>
#include <openrct2/interface/Window.h>
#include <openrct2-ui/interface/Window.h>
#define MINIMUM_TOOL_SIZE 1
#define MAXIMUM_TOOL_SIZE 64

19
src/openrct2-ui/interface/Viewport.h Normal file
View File

@ -0,0 +1,19 @@
#pragma region Copyright (c) 2014-2018 OpenRCT2 Developers
/*****************************************************************************
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
* OpenRCT2 is the work of many authors, a full list can be found in contributors.md
* For more information, visit https://github.com/OpenRCT2/OpenRCT2
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* A full copy of the GNU General Public License can be found in licence.txt
*****************************************************************************/
#pragma endregion
#pragma once
#include <openrct2/interface/Viewport.h>

19
src/openrct2-ui/interface/Widget.h Normal file
View File

@ -0,0 +1,19 @@
#pragma region Copyright (c) 2014-2018 OpenRCT2 Developers
/*****************************************************************************
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
* OpenRCT2 is the work of many authors, a full list can be found in contributors.md
* For more information, visit https://github.com/OpenRCT2/OpenRCT2
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* A full copy of the GNU General Public License can be found in licence.txt
*****************************************************************************/
#pragma endregion
#pragma once
#include <openrct2/interface/Widget.h>

19
src/openrct2-ui/interface/Window.h Normal file
View File

@ -0,0 +1,19 @@
#pragma region Copyright (c) 2014-2018 OpenRCT2 Developers
/*****************************************************************************
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
* OpenRCT2 is the work of many authors, a full list can be found in contributors.md
* For more information, visit https://github.com/OpenRCT2/OpenRCT2
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* A full copy of the GNU General Public License can be found in licence.txt
*****************************************************************************/
#pragma endregion
#pragma once
#include <openrct2/interface/Window.h>

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

@ -18,7 +18,7 @@
#include <openrct2/Context.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>

4
src/openrct2-ui/windows/Banner.cpp
View File

@ -15,12 +15,12 @@
#pragma endregion
#include <openrct2/config/Config.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/Game.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2/world/Scenery.h>
#include <openrct2-ui/interface/Dropdown.h>
#include <openrct2/sprites.h>

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

@ -20,7 +20,7 @@
#include <openrct2/core/Memory.hpp>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/platform/platform.h>
#include <openrct2/util/Util.h>

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

@ -20,7 +20,7 @@
#include <openrct2/core/Math.hpp>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/Context.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Date.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>

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

@ -18,7 +18,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/core/Math.hpp>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/world/Scenery.h>
#include <openrct2-ui/interface/LandTool.h>

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

@ -18,7 +18,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/util/Util.h>
#include <openrct2-ui/interface/Dropdown.h>

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

@ -17,7 +17,7 @@
#include <openrct2/Context.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/paint/tile_element/TileElement.h>
#include <openrct2/paint/Paint.h>

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

@ -15,7 +15,7 @@
#pragma endregion
#include <openrct2/Game.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/windows/Intent.h>

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

@ -18,7 +18,7 @@
#include <openrct2/core/Util.hpp>
#include <openrct2/core/Math.hpp>
#include <openrct2/Input.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
#include <openrct2-ui/interface/Dropdown.h>

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

@ -27,7 +27,7 @@
#include <openrct2/sprites.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/windows/Intent.h>
#include <openrct2/world/Scenery.h>

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

@ -23,7 +23,7 @@
#include <openrct2/Editor.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/management/Research.h>
#include <openrct2/sprites.h>

4
src/openrct2-ui/windows/EditorMain.cpp
View File

@ -17,8 +17,8 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/Context.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/StringIds.h>
#include <openrct2/world/Footpath.h>

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

@ -26,7 +26,7 @@
#include <openrct2/Editor.h>
#include <openrct2/EditorObjectSelectionSession.h>
#include <openrct2/Game.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/object/ObjectManager.h>
#include <openrct2/object/ObjectRepository.h>

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

@ -20,7 +20,7 @@
#include <openrct2/Context.h>
#include <openrct2/core/Util.hpp>
#include <openrct2/Game.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Date.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/OpenRCT2.h>

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

@ -21,7 +21,7 @@
#include <openrct2/Editor.h>
#include <openrct2/Game.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/localisation/StringIds.h>
#include <openrct2/sprites.h>

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

@ -21,7 +21,7 @@
#include <openrct2/audio/audio.h>
#include <openrct2/drawing/Font.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
enum {

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

@ -20,7 +20,7 @@
#include <openrct2/Context.h>
#include <openrct2/Game.h>
#include <openrct2-ui/interface/Graph.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Date.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/ride/RideData.h>

4
src/openrct2-ui/windows/Footpath.cpp
View File

@ -21,8 +21,8 @@
#include <openrct2/Cheats.h>
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/object/ObjectLimits.h>
#include <openrct2/sprites.h>

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

@ -22,7 +22,7 @@
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Date.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/management/NewsItem.h>

4
src/openrct2-ui/windows/Guest.cpp
View File

@ -20,8 +20,8 @@
#include <openrct2/Context.h>
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/management/Marketing.h>
#include <openrct2/network/network.h>

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

@ -18,7 +18,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/Game.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
#include <openrct2-ui/interface/Dropdown.h>

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

@ -22,7 +22,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/audio/audio.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/platform/platform.h>
#include <openrct2/sprites.h>

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

@ -18,7 +18,7 @@
#include <openrct2/core/Math.hpp>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2-ui/interface/Dropdown.h>
#include <openrct2-ui/interface/LandTool.h>

4
src/openrct2-ui/windows/LandRights.cpp
View File

@ -20,8 +20,8 @@
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2-ui/interface/LandTool.h>

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

@ -26,7 +26,7 @@
#include <openrct2/core/String.hpp>
#include <openrct2/Editor.h>
#include <openrct2/Game.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/platform/platform.h>
#include <openrct2/platform/Platform2.h>

4
src/openrct2-ui/windows/Main.cpp
View File

@ -17,8 +17,8 @@
#include <openrct2/Context.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/StringIds.h>
#include <openrct2/world/Footpath.h>

4
src/openrct2-ui/windows/Map.cpp
View File

@ -23,8 +23,8 @@
#include <openrct2/Cheats.h>
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/ride/Track.h>
#include <openrct2/world/Entrance.h>

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

@ -21,7 +21,7 @@
#include <openrct2/localisation/Localisation.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/util/Util.h>
#include <openrct2/world/MapGen.h>
#include <openrct2-ui/interface/Dropdown.h>

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

@ -19,7 +19,7 @@
#include <openrct2/Context.h>
#include <openrct2/Input.h>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
static rct_widget window_map_tooltip_widgets[] = {

4
src/openrct2-ui/windows/MazeConstruction.cpp
View File

@ -21,8 +21,8 @@
#include <openrct2/drawing/Drawing.h>
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/ride/Track.h>
#include <openrct2/sprites.h>

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

@ -18,7 +18,7 @@
#include <openrct2/network/network.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
#include <openrct2/util/Util.h>

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

@ -19,7 +19,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
enum WINDOW_MUSIC_CREDITS_WIDGET_IDX {
WIDX_BACKGROUND,

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

@ -16,7 +16,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/network/network.h>
#include <openrct2/util/Util.h>

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

@ -20,7 +20,7 @@
#include <openrct2/Game.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/ride/Ride.h>
#include <openrct2/ride/RideData.h>
#include <openrct2-ui/interface/Dropdown.h>

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

@ -27,7 +27,7 @@
#include <openrct2/Context.h>
#include <openrct2/audio/audio.h>
#include <openrct2/Game.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/management/NewsItem.h>
#include <openrct2/management/Research.h>

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

@ -24,7 +24,7 @@
#include <openrct2/world/Sprite.h>
#include <openrct2/peep/Staff.h>
#include <openrct2/sprites.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
enum WINDOW_NEWS_WIDGET_IDX {
WIDX_BACKGROUND,

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

@ -18,7 +18,7 @@
#include <openrct2/core/Util.hpp>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>

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

@ -17,7 +17,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/core/Memory.hpp>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/object/ObjectManager.h>
#include <openrct2/platform/platform.h>

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

@ -37,8 +37,8 @@
#include <openrct2/audio/audio.h>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Currency.h>
#include <openrct2/localisation/Date.h>
#include <openrct2/localisation/Language.h>

4
src/openrct2-ui/windows/Park.cpp
View File

@ -25,8 +25,8 @@
#include <openrct2/localisation/Date.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/management/Award.h>
#include <openrct2/util/Util.h>
#include <openrct2/world/Entrance.h>

4
src/openrct2-ui/windows/Player.cpp
View File

@ -22,8 +22,8 @@
#include <openrct2/Input.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/util/Util.h>
#include <openrct2-ui/interface/Dropdown.h>

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

@ -18,7 +18,7 @@
#include <openrct2/Game.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/management/NewsItem.h>
#include <openrct2/management/Research.h>
#include <openrct2/sprites.h>

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

@ -27,8 +27,8 @@
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Date.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/localisation/StringIds.h>

4
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -24,8 +24,8 @@
#include <openrct2/core/Util.hpp>
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/network/network.h>
#include <openrct2/ride/Ride.h>

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

@ -21,7 +21,7 @@
#include <openrct2/core/Util.hpp>
#include <openrct2/Game.h>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/network/network.h>
#include <openrct2/sprites.h>

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

@ -24,7 +24,7 @@
#include <openrct2/audio/audio.h>
#include <openrct2/Game.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
enum WINDOW_SAVE_PROMPT_WIDGET_IDX {
WIDX_BACKGROUND,

4
src/openrct2-ui/windows/Scenery.cpp
View File

@ -20,8 +20,8 @@
#include <openrct2/Context.h>
#include <openrct2/core/Math.hpp>
#include <openrct2/Input.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/network/network.h>
#include <openrct2/object/ObjectList.h>

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

@ -21,7 +21,7 @@
#include <openrct2/Context.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/network/http.h>
#include <openrct2/sprites.h>

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

@ -23,7 +23,7 @@
#include <openrct2/interface/Chat.h>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/util/Util.h>

4
src/openrct2-ui/windows/ShortcutKeyChange.cpp
View File

@ -18,8 +18,8 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2-ui/input/KeyboardShortcuts.h>
#include <openrct2/interface/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Window.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#define WW 250

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

@ -18,7 +18,7 @@
#include <openrct2-ui/input/KeyboardShortcuts.h>
#include "Window.h"
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#define WW 420

4
src/openrct2-ui/windows/Sign.cpp
View File

@ -20,8 +20,8 @@
#include <openrct2/Game.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/localisation/StringIds.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/world/LargeScenery.h>
#include <openrct2/world/Scenery.h>
#include <openrct2/world/Wall.h>

4
src/openrct2-ui/windows/Staff.cpp
View File

@ -21,8 +21,8 @@
#include <openrct2/Context.h>
#include <openrct2/Game.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/peep/Staff.h>
#include <openrct2/sprites.h>

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

@ -16,7 +16,7 @@
#include <openrct2-ui/windows/Window.h>
#include <openrct2/Game.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#define WW 200

4
src/openrct2-ui/windows/StaffList.cpp
View File

@ -23,8 +23,8 @@
#include <openrct2/drawing/Drawing.h>
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/peep/Staff.h>
#include <openrct2/sprites.h>

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

@ -28,7 +28,7 @@
#include <openrct2/core/Math.hpp>
#include <openrct2/core/String.hpp>
#include <openrct2/core/Util.hpp>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/util/Util.h>

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

@ -20,7 +20,7 @@
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
#include <openrct2-ui/interface/Dropdown.h>

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

@ -22,7 +22,7 @@
#include <openrct2/core/Util.hpp>
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/localisation/StringIds.h>
#include <openrct2/ride/RideData.h>

4
src/openrct2-ui/windows/TitleCommandEditor.cpp
View File

@ -23,8 +23,8 @@
#include <openrct2/Input.h>
#include <openrct2/core/Util.hpp>
#include <openrct2/interface/themes.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/scenario/ScenarioRepository.h>
#include <openrct2/scenario/ScenarioSources.h>
#include <openrct2/localisation/Localisation.h>

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

@ -29,7 +29,7 @@
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
#include <openrct2/util/Util.h>

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

@ -20,7 +20,7 @@
#include <openrct2/sprites.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/Intro.h>
enum WINDOW_TITLE_EXIT_WIDGET_IDX {

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

@ -18,7 +18,7 @@
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
static rct_widget window_title_logo_widgets[] = {
{ WIDGETS_END },

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

@ -22,7 +22,7 @@
#include <openrct2/Editor.h>
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
#include <openrct2-ui/interface/Dropdown.h>

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

@ -20,7 +20,7 @@
#include <openrct2/Intro.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
enum WINDOW_TITLE_OPTIONS_WIDGET_IDX {
WIDX_OPTIONS,

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

@ -24,7 +24,7 @@
#include <openrct2/localisation/Date.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/interface/themes.h>
#include <openrct2/util/Util.h>

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

@ -18,7 +18,7 @@
#include <openrct2/core/Math.hpp>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2-ui/windows/Window.h>
enum {

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

@ -28,8 +28,8 @@
#include <openrct2/Input.h>
#include <openrct2/interface/Console.h>
#include <openrct2/interface/Screenshot.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/network/network.h>
#include <openrct2/network/twitch.h>
#include <openrct2/OpenRCT2.h>

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

@ -19,7 +19,7 @@
#include <openrct2/core/Math.hpp>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/util/Util.h>

4
src/openrct2-ui/windows/TrackDesignPlace.cpp
View File

@ -23,8 +23,8 @@
#include <openrct2/core/Memory.hpp>
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/ride/Track.h>
#include <openrct2/ride/TrackData.h>

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

@ -23,7 +23,7 @@
#include <openrct2/core/String.hpp>
#include <openrct2/drawing/IDrawingEngine.h>
#include <openrct2/Editor.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/OpenRCT2.h>
#include <openrct2/rct1/RCT1.h>

4
src/openrct2-ui/windows/ViewClipping.cpp
View File

@ -17,8 +17,8 @@
#include <openrct2/config/Config.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2/localisation/Localisation.h>
enum WINDOW_VIEW_CLIPPING_WIDGET_IDX {

4
src/openrct2-ui/windows/Viewport.cpp
View File

@ -20,8 +20,8 @@
#include <openrct2/Game.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/sprites.h>
#include <openrct2/interface/Viewport.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Viewport.h>
#include <openrct2-ui/interface/Widget.h>
#define INITIAL_WIDTH 500
#define INITIAL_HEIGHT 350

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

@ -18,7 +18,7 @@
#include <openrct2/core/Math.hpp>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/interface/Widget.h>
#include <openrct2-ui/interface/Widget.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2-ui/interface/LandTool.h>

2
src/openrct2-ui/windows/Window.h
View File

@ -18,7 +18,7 @@
#include <openrct2/common.h>
#include <openrct2/interface/Window.h>
#include <openrct2-ui/interface/Window.h>
#include <openrct2/windows/tile_inspector.h>
typedef void (*loadsave_callback)(sint32 result, const utf8 * path);