mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix formatting of C includes
This commit is contained in:
parent
7bd63609bb
commit
247fdc2f5d
|
@ -20,12 +20,12 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/game.h>
|
||||
#include <openrct2/input.h>
|
||||
#include <openrct2/interface/land_tool.h>
|
||||
#include <openrct2/interface/viewport.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/game.h>
|
||||
#include <openrct2/input.h>
|
||||
#include <openrct2/interface/land_tool.h>
|
||||
#include <openrct2/interface/viewport.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
}
|
||||
|
||||
enum WINDOW_WATER_WIDGET_IDX {
|
||||
|
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/input.h>
|
||||
#include <openrct2/interface/land_tool.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/util/util.h>
|
||||
#include <openrct2/world/mapgen.h>
|
||||
#include <openrct2/windows/dropdown.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/input.h>
|
||||
#include <openrct2/interface/land_tool.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/util/util.h>
|
||||
#include <openrct2/world/mapgen.h>
|
||||
#include <openrct2/windows/dropdown.h>
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/util/util.h>
|
||||
#include <openrct2/windows/dropdown.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/util/util.h>
|
||||
#include <openrct2/windows/dropdown.h>
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
}
|
||||
|
||||
enum WINDOW_MUSIC_CREDITS_WIDGET_IDX {
|
||||
|
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/audio/audio.h>
|
||||
#include <openrct2/management/news_item.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/world/sprite.h>
|
||||
#include <openrct2/peep/staff.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/audio/audio.h>
|
||||
#include <openrct2/management/news_item.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/world/sprite.h>
|
||||
#include <openrct2/peep/staff.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
}
|
||||
|
||||
enum WINDOW_NEWS_WIDGET_IDX {
|
||||
|
|
|
@ -20,9 +20,9 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/sprites.h>
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -35,19 +35,19 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/audio/audio.h>
|
||||
#include <openrct2/interface/themes.h>
|
||||
#include <openrct2/interface/viewport.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/currency.h>
|
||||
#include <openrct2/localisation/date.h>
|
||||
#include <openrct2/localisation/language.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/platform/platform.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/util/util.h>
|
||||
#include <openrct2/windows/dropdown.h>
|
||||
#include <openrct2/windows/error.h>
|
||||
#include <openrct2/audio/audio.h>
|
||||
#include <openrct2/interface/themes.h>
|
||||
#include <openrct2/interface/viewport.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/currency.h>
|
||||
#include <openrct2/localisation/date.h>
|
||||
#include <openrct2/localisation/language.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/platform/platform.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/util/util.h>
|
||||
#include <openrct2/windows/dropdown.h>
|
||||
#include <openrct2/windows/error.h>
|
||||
}
|
||||
|
||||
enum WINDOW_OPTIONS_PAGE {
|
||||
|
|
|
@ -21,10 +21,10 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/audio/audio.h>
|
||||
#include <openrct2/game.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/audio/audio.h>
|
||||
#include <openrct2/game.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
}
|
||||
|
||||
enum WINDOW_SAVE_PROMPT_WIDGET_IDX {
|
||||
|
|
|
@ -23,8 +23,8 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/network/http.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/util/util.h>
|
||||
|
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/interface/chat.h>
|
||||
#include <openrct2/interface/themes.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/util/util.h>
|
||||
#include <openrct2/interface/chat.h>
|
||||
#include <openrct2/interface/themes.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/util/util.h>
|
||||
}
|
||||
|
||||
static char _port[7];
|
||||
|
|
|
@ -20,9 +20,9 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/interface/window.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/interface/window.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
}
|
||||
|
||||
#define WW 250
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
}
|
||||
|
||||
#define WW 420
|
||||
|
|
|
@ -19,15 +19,15 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/game.h>
|
||||
#include <openrct2/input.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/windows/dropdown.h>
|
||||
#include <openrct2/interface/themes.h>
|
||||
#include <openrct2/windows/error.h>
|
||||
#include <openrct2/util/util.h>
|
||||
#include <openrct2/game.h>
|
||||
#include <openrct2/input.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/windows/dropdown.h>
|
||||
#include <openrct2/interface/themes.h>
|
||||
#include <openrct2/windows/error.h>
|
||||
#include <openrct2/util/util.h>
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -20,10 +20,10 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/intro.h>
|
||||
#include <openrct2/intro.h>
|
||||
}
|
||||
|
||||
enum WINDOW_TITLE_EXIT_WIDGET_IDX {
|
||||
|
|
|
@ -25,9 +25,9 @@ extern "C"
|
|||
#include <openrct2/game.h>
|
||||
#include <openrct2/input.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/windows/dropdown.h>
|
||||
#include <openrct2/windows/dropdown.h>
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <openrct2/intro.h>
|
||||
#include <openrct2/intro.h>
|
||||
#include <openrct2/localisation/localisation.h>
|
||||
#include <openrct2/interface/widget.h>
|
||||
}
|
||||
|
|
|
@ -15,9 +15,9 @@
|
|||
#pragma endregion
|
||||
|
||||
extern "C" {
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
}
|
||||
|
||||
#define WW 200
|
||||
|
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "dropdown.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "dropdown.h"
|
||||
}
|
||||
|
||||
// The maximum number of rows to list before items overflow into new columns
|
||||
|
|
|
@ -19,16 +19,16 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../audio/audio.h"
|
||||
#include "../game.h"
|
||||
#include "../editor.h"
|
||||
#include "../input.h"
|
||||
#include "../sprites.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../interface/themes.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "error.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../game.h"
|
||||
#include "../editor.h"
|
||||
#include "../input.h"
|
||||
#include "../sprites.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../interface/themes.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "error.h"
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../editor.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../util/util.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "_legacy.h"
|
||||
#include "../editor.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../util/util.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "_legacy.h"
|
||||
}
|
||||
|
||||
#pragma region Widgets
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../world/footpath.h"
|
||||
}
|
||||
|
||||
static void window_editor_main_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
|
|
|
@ -24,20 +24,20 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <ctype.h>
|
||||
#include "../audio/audio.h"
|
||||
#include "../game.h"
|
||||
#include "../editor.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../object_list.h"
|
||||
#include "../rct1.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../util/util.h"
|
||||
#include "dropdown.h"
|
||||
#include "error.h"
|
||||
#include "../sprites.h"
|
||||
#include "_legacy.h"
|
||||
#include <ctype.h>
|
||||
#include "../audio/audio.h"
|
||||
#include "../game.h"
|
||||
#include "../editor.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../object_list.h"
|
||||
#include "../rct1.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../util/util.h"
|
||||
#include "dropdown.h"
|
||||
#include "error.h"
|
||||
#include "../sprites.h"
|
||||
#include "_legacy.h"
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/date.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../util/util.h"
|
||||
#include "dropdown.h"
|
||||
#include "error.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/date.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../util/util.h"
|
||||
#include "dropdown.h"
|
||||
#include "error.h"
|
||||
}
|
||||
|
||||
#pragma region Widgets
|
||||
|
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../editor.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "dropdown.h"
|
||||
#include "error.h"
|
||||
#include "../editor.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "dropdown.h"
|
||||
#include "error.h"
|
||||
}
|
||||
|
||||
#pragma region Widgets
|
||||
|
|
|
@ -20,10 +20,10 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../audio/audio.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "error.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "error.h"
|
||||
}
|
||||
|
||||
bool gDisableErrorWindowSound = false;
|
||||
|
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../interface/graph.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/date.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../sprites.h"
|
||||
#include "dropdown.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/graph.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/date.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../sprites.h"
|
||||
#include "dropdown.h"
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -18,16 +18,16 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../audio/audio.h"
|
||||
#include "../cheats.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "dropdown.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../cheats.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "dropdown.h"
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/date.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../management/news_item.h"
|
||||
#include "../peep/staff.h"
|
||||
#include "../sprites.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/date.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../management/news_item.h"
|
||||
#include "../peep/staff.h"
|
||||
#include "../sprites.h"
|
||||
}
|
||||
|
||||
enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX {
|
||||
|
|
|
@ -19,17 +19,17 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../management/marketing.h"
|
||||
#include "../peep/staff.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../util/util.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../management/marketing.h"
|
||||
#include "../peep/staff.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../util/util.h"
|
||||
#include "../world/footpath.h"
|
||||
}
|
||||
|
||||
enum WINDOW_GUEST_PAGE {
|
||||
|
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "dropdown.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "dropdown.h"
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../audio/audio.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../platform/platform.h"
|
||||
#include "../sprites.h"
|
||||
#include "../util/util.h"
|
||||
#include "error.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../platform/platform.h"
|
||||
#include "../sprites.h"
|
||||
#include "../util/util.h"
|
||||
#include "error.h"
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -19,10 +19,10 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../interface/land_tool.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "dropdown.h"
|
||||
#include "../interface/land_tool.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "dropdown.h"
|
||||
}
|
||||
|
||||
enum WINDOW_LAND_WIDGET_IDX {
|
||||
|
|
|
@ -20,15 +20,15 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include <time.h>
|
||||
#include "../core/Guard.hpp"
|
||||
#include "../editor.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../platform/platform.h"
|
||||
#include "../util/util.h"
|
||||
#include "../windows/error.h"
|
||||
#include <time.h>
|
||||
#include "../core/Guard.hpp"
|
||||
#include "../editor.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../platform/platform.h"
|
||||
#include "../util/util.h"
|
||||
#include "../windows/error.h"
|
||||
}
|
||||
|
||||
#pragma region Widgets
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../world/footpath.h"
|
||||
}
|
||||
|
||||
rct_widget window_main_widgets[] = {
|
||||
|
|
|
@ -22,18 +22,18 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../audio/audio.h"
|
||||
#include "../cheats.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/land_tool.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../world/entrance.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "error.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../cheats.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/land_tool.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../world/entrance.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "error.h"
|
||||
}
|
||||
|
||||
#define MAP_COLOUR_2(colourA, colourB) ((colourA << 8) | colourB)
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
}
|
||||
|
||||
static rct_widget window_map_tooltip_widgets[] = {
|
||||
|
|
|
@ -17,15 +17,15 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../audio/audio.h"
|
||||
#include "../drawing/drawing.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../ride/track.h"
|
||||
#include "../sprites.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../drawing/drawing.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../ride/track.h"
|
||||
#include "../sprites.h"
|
||||
}
|
||||
|
||||
#pragma region Widgets
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../util/util.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../util/util.h"
|
||||
}
|
||||
|
||||
static char _password[33];
|
||||
|
|
|
@ -19,11 +19,11 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "dropdown.h"
|
||||
#include "../game.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "dropdown.h"
|
||||
}
|
||||
|
||||
#define SELECTED_RIDE_UNDEFINED ((uint16)0xFFFF)
|
||||
|
|
|
@ -24,16 +24,16 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../audio/audio.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../management/news_item.h"
|
||||
#include "../rct1.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../ride/track_data.h"
|
||||
#include "../sprites.h"
|
||||
#include "../util/util.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../management/news_item.h"
|
||||
#include "../rct1.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../ride/track_data.h"
|
||||
#include "../sprites.h"
|
||||
#include "../util/util.h"
|
||||
}
|
||||
|
||||
static uint8 _windowNewRideCurrentTab;
|
||||
|
|
|
@ -19,9 +19,9 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../platform/platform.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../platform/platform.h"
|
||||
}
|
||||
|
||||
enum WINDOW_OBJECT_LOAD_ERROR_WIDGET_IDX {
|
||||
|
|
|
@ -20,19 +20,19 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../localisation/date.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/graph.h"
|
||||
#include "../interface/land_tool.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../management/award.h"
|
||||
#include "../util/util.h"
|
||||
#include "../world/entrance.h"
|
||||
#include "dropdown.h"
|
||||
#include "../interface/themes.h"
|
||||
#include "../game.h"
|
||||
#include "../localisation/date.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/graph.h"
|
||||
#include "../interface/land_tool.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../management/award.h"
|
||||
#include "../util/util.h"
|
||||
#include "../world/entrance.h"
|
||||
#include "dropdown.h"
|
||||
#include "../interface/themes.h"
|
||||
}
|
||||
|
||||
enum WINDOW_PARK_PAGE {
|
||||
|
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../util/util.h"
|
||||
#include "dropdown.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../util/util.h"
|
||||
#include "dropdown.h"
|
||||
}
|
||||
|
||||
enum WINDOW_PLAYER_PAGE {
|
||||
|
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../management/news_item.h"
|
||||
#include "../sprites.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "dropdown.h"
|
||||
#include "../game.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../management/news_item.h"
|
||||
#include "../sprites.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "dropdown.h"
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -25,23 +25,23 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../audio/audio.h"
|
||||
#include "../cheats.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/themes.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/date.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../peep/staff.h"
|
||||
#include "../rct1.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../ride/track.h"
|
||||
#include "../ride/track_data.h"
|
||||
#include "../sprites.h"
|
||||
#include "../windows/error.h"
|
||||
#include "dropdown.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../cheats.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/themes.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/date.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../peep/staff.h"
|
||||
#include "../rct1.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../ride/track.h"
|
||||
#include "../ride/track_data.h"
|
||||
#include "../sprites.h"
|
||||
#include "../windows/error.h"
|
||||
#include "dropdown.h"
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -23,20 +23,20 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../audio/audio.h"
|
||||
#include "../cheats.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../ride/track.h"
|
||||
#include "../ride/track_data.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "dropdown.h"
|
||||
#include "../sprites.h"
|
||||
#include "../world/entrance.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../cheats.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../ride/track.h"
|
||||
#include "../ride/track_data.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "dropdown.h"
|
||||
#include "../sprites.h"
|
||||
#include "../world/entrance.h"
|
||||
}
|
||||
|
||||
#pragma region Widgets
|
||||
|
|
|
@ -20,12 +20,12 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "dropdown.h"
|
||||
#include "../interface/themes.h"
|
||||
#include "../game.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "dropdown.h"
|
||||
#include "../interface/themes.h"
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -20,15 +20,15 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../audio/audio.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "dropdown.h"
|
||||
#include "error.h"
|
||||
#include "../sprites.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "dropdown.h"
|
||||
#include "error.h"
|
||||
#include "../sprites.h"
|
||||
}
|
||||
|
||||
#define WINDOW_SCENERY_WIDTH 634
|
||||
|
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "dropdown.h"
|
||||
#include "../sprites.h"
|
||||
#include "../game.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "dropdown.h"
|
||||
#include "../sprites.h"
|
||||
}
|
||||
|
||||
#define WW 113
|
||||
|
|
|
@ -18,16 +18,16 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../peep/staff.h"
|
||||
#include "../sprites.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "../input.h"
|
||||
#include "dropdown.h"
|
||||
#include "../interface/themes.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../peep/staff.h"
|
||||
#include "../sprites.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "../input.h"
|
||||
#include "dropdown.h"
|
||||
#include "../interface/themes.h"
|
||||
}
|
||||
|
||||
#define WW 190
|
||||
|
|
|
@ -16,9 +16,9 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../game.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
}
|
||||
|
||||
#define WW 200
|
||||
|
|
|
@ -18,18 +18,18 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../drawing/drawing.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../peep/staff.h"
|
||||
#include "../sprites.h"
|
||||
#include "../util/util.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "dropdown.h"
|
||||
#include "error.h"
|
||||
#include "../drawing/drawing.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../peep/staff.h"
|
||||
#include "../sprites.h"
|
||||
#include "../util/util.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "dropdown.h"
|
||||
#include "error.h"
|
||||
}
|
||||
|
||||
enum {
|
||||
|
|
|
@ -27,9 +27,9 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../util/util.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../util/util.h"
|
||||
}
|
||||
|
||||
#define WW 250
|
||||
|
|
|
@ -20,19 +20,19 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../common.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../ride/track.h"
|
||||
#include "../sprites.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "../world/tile_inspector.h"
|
||||
#include "dropdown.h"
|
||||
#include "tile_inspector.h"
|
||||
#include "../common.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../ride/ride_data.h"
|
||||
#include "../ride/track.h"
|
||||
#include "../sprites.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "../world/tile_inspector.h"
|
||||
#include "dropdown.h"
|
||||
#include "tile_inspector.h"
|
||||
}
|
||||
|
||||
static const rct_string_id TerrainTypeStringIds[] = {
|
||||
|
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../game.h"
|
||||
#include "../game.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../util/util.h"
|
||||
#include "dropdown.h"
|
||||
#include "dropdown.h"
|
||||
#include "error.h"
|
||||
}
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ extern "C"
|
|||
#include "../localisation/localisation.h"
|
||||
#include "../sprites.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../interface/themes.h"
|
||||
#include "../interface/themes.h"
|
||||
#include "../util/util.h"
|
||||
}
|
||||
|
||||
|
|
|
@ -19,10 +19,10 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../localisation/localisation.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "tooltip.h"
|
||||
#include "tooltip.h"
|
||||
}
|
||||
|
||||
enum {
|
||||
|
@ -242,4 +242,4 @@ extern "C"
|
|||
{
|
||||
_window_tooltip_close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -28,15 +28,15 @@ extern "C"
|
|||
#include "../audio/audio.h"
|
||||
#include "../cheats.h"
|
||||
#include "../editor.h"
|
||||
#include "../input.h"
|
||||
#include "../input.h"
|
||||
#include "../interface/console.h"
|
||||
#include "../interface/land_tool.h"
|
||||
#include "../interface/viewport.h"
|
||||
#include "../interface/widget.h"
|
||||
#include "../network/twitch.h"
|
||||
#include "../network/twitch.h"
|
||||
#include "../peep/staff.h"
|
||||
#include "../util/util.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "../util/util.h"
|
||||
#include "../world/footpath.h"
|
||||
#include "../world/scenery.h"
|
||||
#include "dropdown.h"
|
||||
}
|
||||
|
|
|
@ -60,4 +60,4 @@ const rct_object_entry DefaultSelectedObjects[26] = {
|
|||
{ 0x00000087, { "SCGJUNGL" }, 0 }, // Jungle Theming
|
||||
{ 0x00000087, { "SCGSNOW " }, 0 }, // Snow and Ice Theming
|
||||
{ 0x00000087, { "SCGWATER" }, 0 } // Water Feature Theming
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue