From 20ea3edef29f15ecb06dbfc0a6c4360de46d102b Mon Sep 17 00:00:00 2001 From: Ted John Date: Thu, 1 Dec 2016 15:24:52 +0000 Subject: [PATCH] Fix rebase errors --- src/config.c | 1 - src/interface/title_sequences.c | 2 +- src/platform/shared.c | 2 +- src/title/TitleSequencePlayer.h | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/config.c b/src/config.c index 3796364c8a..63c5ad4e16 100644 --- a/src/config.c +++ b/src/config.c @@ -334,7 +334,6 @@ twitch_configuration gConfigTwitch; network_configuration gConfigNetwork; notification_configuration gConfigNotifications; font_configuration gConfigFonts; -title_sequences_configuration gConfigTitleSequences; static bool config_open(const utf8string path); static bool config_save(const utf8string path); diff --git a/src/interface/title_sequences.c b/src/interface/title_sequences.c index 7951380255..e7563c3399 100644 --- a/src/interface/title_sequences.c +++ b/src/interface/title_sequences.c @@ -16,7 +16,7 @@ #include "../localisation/string_ids.h" #include "../rct2.h" -#include "../title.h" +#include "../title/TitleScreen.h" #include "../title/TitleSequence.h" #include "../title/TitleSequenceManager.h" #include "../util/util.h" diff --git a/src/platform/shared.c b/src/platform/shared.c index 065e05d32b..c10e7fd62d 100644 --- a/src/platform/shared.c +++ b/src/platform/shared.c @@ -29,7 +29,7 @@ #include "../localisation/localisation.h" #include "../OpenRCT2.h" #include "../rct2.h" -#include "../title.h" +#include "../title/TitleScreen.h" #include "../util/util.h" #include "../world/climate.h" #include "platform.h" diff --git a/src/title/TitleSequencePlayer.h b/src/title/TitleSequencePlayer.h index 0bacb048ba..30023ebe57 100644 --- a/src/title/TitleSequencePlayer.h +++ b/src/title/TitleSequencePlayer.h @@ -17,7 +17,6 @@ #pragma once #include -#include "drawing/drawing.h" #ifdef __cplusplus