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

Fix rebase errors

This commit is contained in:
Ted John 2016-12-01 15:24:52 +00:00
parent 11a2b98e58
commit 20ea3edef2
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/config.c
View File

@ -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);

2
src/interface/title_sequences.c
View File

@ -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"

2
src/platform/shared.c
View File

@ -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"

1
src/title/TitleSequencePlayer.h
View File

@ -17,7 +17,6 @@
#pragma once
#include <SDL.h>
#include "drawing/drawing.h"
#ifdef __cplusplus