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

Include new config header

This commit is contained in:
Ted John 2017-02-18 15:45:10 +00:00
parent 4457749b35
commit fb2c835d52
113 changed files with 166 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/OpenRCT2.cpp
View File

@ -35,7 +35,7 @@
extern "C"
{
#include "audio/audio.h"
#include "config.h"
#include "config/Config.h"
#include "editor.h"
#include "game.h"
#include "interface/chat.h"

2
src/openrct2/audio/AudioMixer.cpp
View File

@ -25,7 +25,7 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../localisation/localisation.h"
#include "../OpenRCT2.h"
#include "../platform/platform.h"

2
src/openrct2/audio/audio.cpp
View File

@ -24,7 +24,7 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../interface/viewport.h"
#include "../intro.h"
#include "../localisation/language.h"

2
src/openrct2/cheats.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "cheats.h"
#include "config.h"
#include "config/Config.h"
#include "game.h"
#include "interface/window.h"
#include "localisation/date.h"

2
src/openrct2/cmdline/RootCommands.cpp
View File

@ -20,7 +20,7 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../platform/crash.h"
}

9
src/openrct2/config/Config.cpp
View File

@ -33,6 +33,7 @@ extern "C"
#include "../localisation/currency.h"
#include "../localisation/date.h"
#include "../localisation/language.h"
#include "../platform/platform.h"
#include "../scenario/scenario.h"
}
@ -587,6 +588,14 @@ namespace Config
extern "C"
{
GeneralConfiguration gConfigGeneral;
InterfaceConfiguration gConfigInterface;
SoundConfiguration gConfigSound;
TwitchConfiguration gConfigTwitch;
NetworkConfiguration gConfigNetwork;
NotificationConfiguration gConfigNotifications;
FontConfiguration gConfigFonts;
void config_set_defaults()
{
Config::SetDefaults();

20
src/openrct2/config/Config.h
View File

@ -187,14 +187,6 @@ typedef struct FontConfiguration
sint32 height_big;
} FontConfiguration;
extern GeneralConfiguration gConfigGeneral;
extern InterfaceConfiguration gConfigInterface;
extern SoundConfiguration gConfigSound;
extern TwitchConfiguration gConfigTwitch;
extern NetworkConfiguration gConfigNetwork;
extern NotificationConfiguration gConfigNotifications;
extern FontConfiguration gConfigFonts;
enum SORT
{
SORT_NAME_ASCENDING,
@ -216,8 +208,18 @@ enum MEASUREMENT_FORMAT
MEASUREMENT_FORMAT_SI
};
#ifdef __cplusplus
extern "C"
{
#endif
extern GeneralConfiguration gConfigGeneral;
extern InterfaceConfiguration gConfigInterface;
extern SoundConfiguration gConfigSound;
extern TwitchConfiguration gConfigTwitch;
extern NetworkConfiguration gConfigNetwork;
extern NotificationConfiguration gConfigNotifications;
extern FontConfiguration gConfigFonts;
bool config_open(const utf8 * path);
bool config_save(const utf8 * path);
void config_get_default_path(utf8 *outPath, size_t size);
@ -226,4 +228,6 @@ extern "C"
bool config_open_default();
bool config_save_default();
bool config_find_or_browse_install_directory();
#ifdef __cplusplus
}
#endif

2
src/openrct2/config/KeyboardShortcuts.cpp
View File

@ -20,10 +20,10 @@
#include "../core/Memory.hpp"
#include "../core/Path.hpp"
#include "../core/String.hpp"
#include "../interface/keyboard_shortcut.h"
extern "C"
{
#include "../interface/keyboard_shortcut.h"
#include "../platform/platform.h"
}

10
src/openrct2/drawing/IDrawingEngine.h
View File

@ -20,9 +20,6 @@
#include <SDL_video.h>
struct rct_drawpixelinfo;
interface IDrawingContext;
enum DRAWING_ENGINE
{
DRAWING_ENGINE_NONE = -1,
@ -41,6 +38,11 @@ enum DRAWING_ENGINE_FLAGS
DEF_DIRTY_OPTIMISATIONS = 1 << 0,
};
#ifdef __cplusplus
struct rct_drawpixelinfo;
interface IDrawingContext;
interface IDrawingEngine
{
virtual ~IDrawingEngine() { }
@ -81,3 +83,5 @@ interface IRainDrawer
sint32 xStart,
sint32 yStart) abstract;
};
#endif

2
src/openrct2/drawing/NewDrawing.cpp
View File

@ -21,7 +21,7 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../interface/screenshot.h"
#include "../localisation/string_ids.h"

2
src/openrct2/drawing/Rain.cpp
View File

@ -19,7 +19,7 @@ extern "C"
#include "../interface/window.h"
#include "../world/climate.h"
#include "drawing.h"
#include "../config.h"
#include "../config/Config.h"
}
#include "IDrawingEngine.h"

2
src/openrct2/drawing/engines/SoftwareDrawingEngine.cpp
View File

@ -23,7 +23,7 @@
extern "C"
{
#include "../../config.h"
#include "../../config/Config.h"
#include "../../game.h"
#include "../../interface/screenshot.h"
#include "../../interface/viewport.h"

4
src/openrct2/drawing/engines/opengl/OpenGLDrawingEngine.cpp
View File

@ -47,11 +47,11 @@ IDrawingEngine * DrawingEngineFactory::CreateOpenGL()
#include "../../IDrawingContext.h"
#include "../../IDrawingEngine.h"
#include "../../Rain.h"
#include "../../../config.h"
#include "../../../config/Config.h"
extern "C"
{
#include "../../../config.h"
#include "../../../config/Config.h"
#include "../../../interface/screenshot.h"
#include "../../../interface/window.h"
#include "../../../intro.h"

2
src/openrct2/drawing/scrolling_text.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../rct2/addresses.h"
#include "../config.h"
#include "../config/Config.h"
#include "../interface/colour.h"
#include "../localisation/localisation.h"
#include "../sprites.h"

2
src/openrct2/drawing/sprite.cpp
View File

@ -24,7 +24,7 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../rct2/addresses.h"
#include "../util/util.h"
#include "drawing.h"

1
src/openrct2/drawing/string.c
View File

@ -17,6 +17,7 @@
#include "../interface/colour.h"
#include "../interface/viewport.h"
#include "../localisation/localisation.h"
#include "../platform/platform.h"
#include "../sprites.h"
#include "../util/util.h"

2
src/openrct2/game.c
View File

@ -16,7 +16,7 @@
#include "audio/audio.h"
#include "cheats.h"
#include "config.h"
#include "config/Config.h"
#include "editor.h"
#include "game.h"
#include "input.h"

2
src/openrct2/input.c
View File

@ -16,7 +16,7 @@
#include <SDL_keycode.h>
#include "audio/audio.h"
#include "config.h"
#include "config/Config.h"
#include "game.h"
#include "input.h"
#include "interface/chat.h"

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

@ -21,7 +21,7 @@
#include "Fonts.h"
extern "C" {
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../localisation/language.h"
}

3
src/openrct2/interface/Theme.cpp
View File

@ -22,7 +22,8 @@
extern "C"
{
#include "../common.h"
#include "../config.h"
#include "../config/Config.h"
#include "../platform/platform.h"
#include "themes.h"
#include "window.h"
}

2
src/openrct2/interface/console.c
View File

@ -17,7 +17,7 @@
#include <stdarg.h>
#include <SDL_scancode.h>
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../input.h"

2
src/openrct2/interface/keyboard_shortcut.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../audio/audio.h"
#include "../config.h"
#include "../config/Config.h"
#include "../editor.h"
#include "../game.h"
#include "../input.h"

4
src/openrct2/interface/keyboard_shortcut.h
View File

@ -38,8 +38,6 @@ typedef struct shortcut_entry {
uint8 modifier;
} shortcut_entry;
extern uint16 gShortcutKeys[SHORTCUT_COUNT];
enum {
SHORTCUT_CLOSE_TOP_MOST_WINDOW,
SHORTCUT_CLOSE_ALL_FLOATING_WINDOWS,
@ -97,4 +95,6 @@ enum {
SHORTCUT_COUNT
};
extern uint16 gShortcutKeys[SHORTCUT_COUNT];
#endif

2
src/openrct2/interface/screenshot.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../audio/audio.h"
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../Imaging.h"

2
src/openrct2/interface/viewport.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../input.h"

2
src/openrct2/interface/window.c
View File

@ -29,7 +29,7 @@
#include "viewport.h"
#include "widget.h"
#include "window.h"
#include "../config.h"
#include "../config/Config.h"
#define RCT2_FIRST_WINDOW (g_window_list)
#define RCT2_LAST_WINDOW (gWindowNextSlot - 1)

2
src/openrct2/localisation/currency.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../util/util.h"
#include "currency.h"
#include "string_ids.h"

2
src/openrct2/localisation/localisation.c
View File

@ -23,7 +23,7 @@
#include <errno.h>
#endif // __WINDOWS__
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../util/util.h"
#include "date.h"

2
src/openrct2/management/award.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../peep/peep.h"

2
src/openrct2/management/marketing.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"

2
src/openrct2/management/research.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/window.h"
#include "../localisation/date.h"

2
src/openrct2/network/NetworkServerAdvertiser.cpp
View File

@ -25,7 +25,7 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../localisation/date.h"
#include "../management/finance.h"
#include "../peep/peep.h"

2
src/openrct2/network/network.cpp
View File

@ -51,7 +51,7 @@ sint32 _pickup_peep_old_x = SPRITE_LOCATION_NULL;
#include "../rct2/S6Exporter.h"
extern "C" {
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/chat.h"
#include "../interface/window.h"

2
src/openrct2/network/twitch.cpp
View File

@ -35,7 +35,7 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../interface/console.h"

2
src/openrct2/object/ObjectRepository.cpp
View File

@ -43,7 +43,7 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../localisation/localisation.h"
#include "../object.h"
#include "../object_list.h"

2
src/openrct2/object/RideObject.cpp
View File

@ -23,7 +23,7 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../localisation/localisation.h"
#include "../rct1.h"

2
src/openrct2/paint/map_element/banner.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../paint.h"
#include "../../config.h"
#include "../../config/Config.h"
#include "../../game.h"
#include "../../interface/viewport.h"
#include "../../localisation/localisation.h"

2
src/openrct2/paint/map_element/entrance.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../../config.h"
#include "../../config/Config.h"
#include "../../game.h"
#include "../../interface/viewport.h"
#include "../../localisation/localisation.h"

2
src/openrct2/paint/map_element/fence.c
View File

@ -20,7 +20,7 @@
#include "../../world/scenery.h"
#include "../../game.h"
#include "../../ride/track.h"
#include "../../config.h"
#include "../../config/Config.h"
#include "../../localisation/localisation.h"
#include "../../interface/colour.h"
#include "../../interface/viewport.h"

2
src/openrct2/paint/map_element/map_element.c
View File

@ -21,7 +21,7 @@
#include "../../ride/ride_data.h"
#include "../../ride/track_data.h"
#include "../../ride/track_paint.h"
#include "../../config.h"
#include "../../config/Config.h"
#include "../../world/sprite.h"
#include "../../world/banner.h"
#include "../../world/entrance.h"

2
src/openrct2/paint/map_element/path.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../../config.h"
#include "../../config/Config.h"
#include "../../game.h"
#include "../../interface/viewport.h"
#include "../../localisation/localisation.h"

2
src/openrct2/paint/map_element/scenery.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "map_element.h"
#include "../../config.h"
#include "../../config/Config.h"
#include "../../game.h"
#include "../../interface/viewport.h"
#include "../../localisation/date.h"

2
src/openrct2/paint/map_element/scenery_multiple.c
View File

@ -17,7 +17,7 @@
#include "map_element.h"
#include "../paint.h"
#include "../supports.h"
#include "../../config.h"
#include "../../config/Config.h"
#include "../../game.h"
#include "../../interface/viewport.h"
#include "../../localisation/localisation.h"

2
src/openrct2/paint/map_element/surface.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../../cheats.h"
#include "../../config.h"
#include "../../config/Config.h"
#include "../../interface/viewport.h"
#include "../../peep/staff.h"
#include "../../rct2.h"

2
src/openrct2/paint/paint.c
View File

@ -17,7 +17,7 @@
#include "paint.h"
#include "../drawing/drawing.h"
#include "../localisation/localisation.h"
#include "../config.h"
#include "../config/Config.h"
#include "../interface/viewport.h"
#include "map_element/map_element.h"
#include "sprite/sprite.h"

2
src/openrct2/paint/sprite/peep.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../../config.h"
#include "../../config/Config.h"
#include "../../drawing/lightfx.h"
#include "../../interface/viewport.h"
#include "../../paint/sprite/sprite.h"

2
src/openrct2/peep/peep.c
View File

@ -17,7 +17,7 @@
#include "../audio/audio.h"
#include "../audio/AudioMixer.h"
#include "../cheats.h"
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../input.h"
#include "../interface/window.h"

2
src/openrct2/peep/staff.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/viewport.h"
#include "../localisation/date.h"

2
src/openrct2/platform/linux.c
View File

@ -33,7 +33,7 @@
#include <fnmatch.h>
#include <locale.h>
#include "../config.h"
#include "../config/Config.h"
#include "../localisation/language.h"
#include "../localisation/string_ids.h"
#include "../util/util.h"

2
src/openrct2/platform/posix.c
View File

@ -26,7 +26,7 @@
#include <pwd.h>
#include <time.h>
#include <SDL_syswm.h>
#include "../config.h"
#include "../config/Config.h"
#include "../localisation/language.h"
#include "../OpenRCT2.h"
#include "../util/util.h"

3
src/openrct2/platform/shared.c
View File

@ -16,8 +16,9 @@
#include "../audio/audio.h"
#include "../audio/AudioMixer.h"
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../drawing/IDrawingEngine.h"
#include "../drawing/lightfx.h"
#include "../editor.h"
#include "../game.h"

2
src/openrct2/platform/windows.c
View File

@ -31,7 +31,7 @@
#include <SDL_syswm.h>
#include <sys/stat.h>
#include "../config.h"
#include "../config/Config.h"
#include "../localisation/language.h"
#include "../OpenRCT2.h"
#include "../util/util.h"

2
src/openrct2/rct1.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "config.h"
#include "config/Config.h"
#include "game.h"
#include "localisation/string_ids.h"
#include "rct1.h"

3
src/openrct2/rct2.c
View File

@ -19,7 +19,7 @@
#include <time.h>
#include "audio/audio.h"
#include "audio/AudioMixer.h"
#include "config.h"
#include "config/Config.h"
#include "drawing/drawing.h"
#include "drawing/lightfx.h"
#include "editor.h"
@ -27,6 +27,7 @@
#include "input.h"
#include "interface/chat.h"
#include "interface/console.h"
#include "interface/keyboard_shortcut.h"
#include "interface/viewport.h"
#include "intro.h"
#include "localisation/date.h"

2
src/openrct2/rct2/S6Exporter.cpp
View File

@ -27,7 +27,7 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/viewport.h"
#include "../interface/window.h"

2
src/openrct2/rct2/S6Importer.cpp
View File

@ -29,7 +29,7 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/viewport.h"
#include "../localisation/date.h"

2
src/openrct2/ride/gentle/mini_golf.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../../config.h"
#include "../../config/Config.h"
#include "../../interface/viewport.h"
#include "../../paint/paint.h"
#include "../../paint/supports.h"

2
src/openrct2/ride/ride.c
View File

@ -18,7 +18,7 @@
#include "../audio/AudioMixer.h"
#include "../cheats.h"
#include "../common.h"
#include "../config.h"
#include "../config/Config.h"
#include "../editor.h"
#include "../game.h"
#include "../input.h"

2
src/openrct2/ride/thrill/launched_freefall.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../../common.h"
#include "../../config.h"
#include "../../config/Config.h"
#include "../../interface/viewport.h"
#include "../../world/sprite.h"
#include "../../paint/paint.h"

2
src/openrct2/ride/track.c
View File

@ -16,7 +16,7 @@
#include "../audio/audio.h"
#include "../cheats.h"
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/viewport.h"
#include "../localisation/localisation.h"

2
src/openrct2/ride/track_design_save.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../audio/audio.h"
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../localisation/localisation.h"
#include "../localisation/string_ids.h"

2
src/openrct2/ride/track_paint.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../paint/supports.h"
#include "../interface/viewport.h"

2
src/openrct2/ride/vehicle.c
View File

@ -16,7 +16,7 @@
#include "../audio/audio.h"
#include "../audio/AudioMixer.h"
#include "../config.h"
#include "../config/Config.h"
#include "../editor.h"
#include "../game.h"
#include "../interface/viewport.h"

2
src/openrct2/ride/water/river_rapids.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../../config.h"
#include "../../config/Config.h"
#include "../../interface/viewport.h"
#include "../../world/sprite.h"
#include "../../paint/paint.h"

2
src/openrct2/ride/water/splash_boats.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../../config.h"
#include "../../config/Config.h"
#include "../../interface/viewport.h"
#include "../../paint/paint.h"
#include "../../paint/supports.h"

3
src/openrct2/scenario/ScenarioRepository.cpp
View File

@ -32,8 +32,9 @@
extern "C"
{
#include "../config.h"
#include "../config/Config.h"
#include "../localisation/localisation.h"
#include "../platform/platform.h"
#include "../rct2.h"
#include "scenario.h"
}

2
src/openrct2/scenario/scenario.c
View File

@ -16,7 +16,7 @@
#include "../audio/audio.h"
#include "../cheats.h"
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/viewport.h"
#include "../localisation/date.h"

3
src/openrct2/scenario/scenario.h
View File

@ -21,7 +21,6 @@
#include "../management/finance.h"
#include "../management/research.h"
#include "../object.h"
#include "../platform/platform.h"
#include "../rct12.h"
#include "../rct2.h"
#include "../rct2/addresses.h"
@ -382,7 +381,7 @@ extern rct_s6_info gS6Info;
extern char gScenarioName[64];
extern char gScenarioDetails[256];
extern char gScenarioCompletedBy[32];
extern char gScenarioSavePath[MAX_PATH];
extern char gScenarioSavePath[260];
extern char gScenarioExpansionPacks[3256];
extern sint32 gFirstTimeSave;
extern uint16 gSavedAge;

2
src/openrct2/title/TitleScreen.cpp
View File

@ -26,7 +26,7 @@
extern "C"
{
#include "../audio/audio.h"
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../input.h"

2
src/openrct2/windows/banner.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../game.h"
#include "../config.h"
#include "../config/Config.h"
#include "../localisation/localisation.h"
#include "../interface/viewport.h"
#include "../interface/widget.h"

2
src/openrct2/windows/cheats.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/widget.h"
#include "../interface/window.h"

2
src/openrct2/windows/custom_currency.c
View File

@ -18,7 +18,7 @@
* 'Custom currency configuration' window definition and logic.
*/
#include "../config.h"
#include "../config/Config.h"
#include "../localisation/localisation.h"
#include "../interface/widget.h"
#include "../interface/window.h"

2
src/openrct2/windows/editor_bottom_toolbar.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../audio/audio.h"
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../editor.h"
#include "../input.h"

2
src/openrct2/windows/editor_object_selection.c
View File

@ -17,7 +17,7 @@
#pragma warning(disable : 4295) // 'identifier': array is too small to include a terminating null character
#include "../audio/audio.h"
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../editor.h"
#include "../interface/themes.h"

3
src/openrct2/windows/error.c
View File

@ -15,9 +15,10 @@
#pragma endregion
#include "../audio/audio.h"
#include "../localisation/localisation.h"
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../platform/platform.h"
#include "../rct2.h"
#include "error.h"

2
src/openrct2/windows/finances.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/graph.h"
#include "../interface/widget.h"

2
src/openrct2/windows/game_bottom_toolbar.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../input.h"
#include "../interface/themes.h"

2
src/openrct2/windows/guest.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../input.h"
#include "../management/marketing.h"

2
src/openrct2/windows/guest_list.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/themes.h"
#include "../interface/widget.h"

3
src/openrct2/windows/install_track.c
View File

@ -20,11 +20,12 @@
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../object/ObjectManager.h"
#include "../platform/platform.h"
#include "../ride/ride.h"
#include "../ride/track.h"
#include "../ride/track_design.h"
#include "../ride/TrackDesignRepository.h"
#include "../object/ObjectManager.h"
#include "../sprites.h"
#include "../util/util.h"
#include "error.h"

2
src/openrct2/windows/loadsave.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include <time.h>
#include "../config.h"
#include "../config/Config.h"
#include "../editor.h"
#include "../game.h"
#include "../interface/themes.h"

3
src/openrct2/windows/map_tooltip.c
View File

@ -14,10 +14,11 @@
*****************************************************************************/
#pragma endregion
#include "../localisation/localisation.h"
#include "../input.h"
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../platform/platform.h"
static rct_widget window_map_tooltip_widgets[] = {
{ WWT_IMGBTN, 0, 0, 199, 0, 29, 0xFFFFFFFF, STR_NONE },

2
src/openrct2/windows/multiplayer.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../interface/themes.h"
#include "../interface/widget.h"
#include "../interface/window.h"

2
src/openrct2/windows/new_campaign.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../localisation/localisation.h"
#include "../interface/widget.h"

2
src/openrct2/windows/new_ride.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../audio/audio.h"
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/widget.h"
#include "../interface/window.h"

36
src/openrct2/windows/news_options.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
@ -33,23 +33,23 @@ typedef struct notification_def {
} notification_def;
static const notification_def NewsItemOptionDefinitions[] = {
{ NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_AWARD, offsetof(notification_configuration, park_award) },
{ NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_MARKETING_CAMPAIGN_FINISHED, offsetof(notification_configuration, park_marketing_campaign_finished) },
{ NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_WARNINGS, offsetof(notification_configuration, park_warnings) },
{ NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_RATING_WARNINGS, offsetof(notification_configuration, park_rating_warnings) },
{ NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_BROKEN_DOWN, offsetof(notification_configuration, ride_broken_down) },
{ NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_CRASHED, offsetof(notification_configuration, ride_crashed) },
{ NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_WARNINGS, offsetof(notification_configuration, ride_warnings) },
{ NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_RESEARCHED, offsetof(notification_configuration, ride_researched) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_WARNINGS, offsetof(notification_configuration, guest_warnings) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LOST, offsetof(notification_configuration, guest_lost) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LEFT_PARK, offsetof(notification_configuration, guest_left_park) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_QUEUING_FOR_RIDE, offsetof(notification_configuration, guest_queuing_for_ride) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_ON_RIDE, offsetof(notification_configuration, guest_on_ride) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LEFT_RIDE, offsetof(notification_configuration, guest_left_ride) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_BOUGHT_ITEM, offsetof(notification_configuration, guest_bought_item) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_USED_FACILITY, offsetof(notification_configuration, guest_used_facility) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_DIED, offsetof(notification_configuration, guest_died) },
{ NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_AWARD, offsetof(NotificationConfiguration, park_award) },
{ NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_MARKETING_CAMPAIGN_FINISHED, offsetof(NotificationConfiguration, park_marketing_campaign_finished) },
{ NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_WARNINGS, offsetof(NotificationConfiguration, park_warnings) },
{ NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_RATING_WARNINGS, offsetof(NotificationConfiguration, park_rating_warnings) },
{ NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_BROKEN_DOWN, offsetof(NotificationConfiguration, ride_broken_down) },
{ NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_CRASHED, offsetof(NotificationConfiguration, ride_crashed) },
{ NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_WARNINGS, offsetof(NotificationConfiguration, ride_warnings) },
{ NOTIFICATION_CATEGORY_RIDE, STR_NOTIFICATION_RIDE_RESEARCHED, offsetof(NotificationConfiguration, ride_researched) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_WARNINGS, offsetof(NotificationConfiguration, guest_warnings) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LOST, offsetof(NotificationConfiguration, guest_lost) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LEFT_PARK, offsetof(NotificationConfiguration, guest_left_park) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_QUEUING_FOR_RIDE, offsetof(NotificationConfiguration, guest_queuing_for_ride) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_ON_RIDE, offsetof(NotificationConfiguration, guest_on_ride) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_LEFT_RIDE, offsetof(NotificationConfiguration, guest_left_ride) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_BOUGHT_ITEM, offsetof(NotificationConfiguration, guest_bought_item) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_USED_FACILITY, offsetof(NotificationConfiguration, guest_used_facility) },
{ NOTIFICATION_CATEGORY_GUEST, STR_NOTIFICATION_GUEST_DIED, offsetof(NotificationConfiguration, guest_died) },
};
enum WINDOW_NEWS_WIDGET_IDX {

3
src/openrct2/windows/options.c
View File

@ -24,8 +24,9 @@
#include "../audio/audio.h"
#include "../audio/AudioMixer.h"
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../drawing/IDrawingEngine.h"
#include "../interface/themes.h"
#include "../interface/viewport.h"
#include "../interface/widget.h"

2
src/openrct2/windows/park.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../localisation/date.h"
#include "../localisation/localisation.h"

2
src/openrct2/windows/player.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../input.h"
#include "../management/marketing.h"

2
src/openrct2/windows/ride.c
View File

@ -16,7 +16,7 @@
#include "../audio/audio.h"
#include "../cheats.h"
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../input.h"
#include "../interface/themes.h"

2
src/openrct2/windows/ride_construction.c
View File

@ -16,7 +16,7 @@
#include "../audio/audio.h"
#include "../cheats.h"
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../input.h"

2
src/openrct2/windows/ride_list.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../ride/ride.h"
#include "../localisation/localisation.h"

2
src/openrct2/windows/save_prompt.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../audio/audio.h"
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../localisation/localisation.h"
#include "../interface/themes.h"

2
src/openrct2/windows/server_list.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../interface/colour.h"
#include "../interface/themes.h"
#include "../interface/widget.h"

2
src/openrct2/windows/server_start.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../interface/themes.h"
#include "../interface/widget.h"
#include "../interface/window.h"

2
src/openrct2/windows/shortcut_key_change.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../interface/keyboard_shortcut.h"
#include "../interface/themes.h"
#include "../interface/window.h"

2
src/openrct2/windows/shortcut_keys.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../interface/window.h"
#include "../interface/widget.h"
#include "../localisation/localisation.h"

2
src/openrct2/windows/sign.c
View File

@ -15,7 +15,7 @@
#pragma endregion
#include "../game.h"
#include "../config.h"
#include "../config/Config.h"
#include "../localisation/localisation.h"
#include "../interface/viewport.h"
#include "../interface/widget.h"

2
src/openrct2/windows/staff.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../game.h"
#include "../interface/viewport.h"
#include "../interface/widget.h"

2
src/openrct2/windows/staff_list.c
View File

@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../config.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../game.h"
#include "../input.h"

Some files were not shown because too many files have changed in this diff Show More