diff --git a/openrct2.vcxproj b/openrct2.vcxproj index c471071417..b8ad4d525a 100644 --- a/openrct2.vcxproj +++ b/openrct2.vcxproj @@ -271,7 +271,7 @@ - + @@ -408,4 +408,4 @@ - + \ No newline at end of file diff --git a/openrct2.vcxproj.filters b/openrct2.vcxproj.filters index 4bc24ee773..1e67da3095 100644 --- a/openrct2.vcxproj.filters +++ b/openrct2.vcxproj.filters @@ -917,12 +917,12 @@ Source\RCT1 - - Source\RCT1 - Resource Files + + Source\RCT1 + diff --git a/src/rct1.c b/src/rct1.c index 726b10cb0a..caa9d35f51 100644 --- a/src/rct1.c +++ b/src/rct1.c @@ -18,27 +18,11 @@ * along with this program. If not, see . *****************************************************************************/ -#define USE_DEFAULT_VEHICLE 255 - #include "addresses.h" #include "config.h" -#include "editor.h" -#include "game.h" -#include "interface/viewport.h" -#include "interface/window.h" -#include "localisation/localisation.h" -#include "management/finance.h" -#include "object.h" #include "rct1.h" -#include "ride/ride.h" -#include "scenario.h" #include "util/sawyercoding.h" #include "util/util.h" -#include "world/climate.h" -#include "world/footpath.h" -#include "world/map.h" -#include "world/map_animation.h" -#include "world/scenery.h" bool rct1_read_sc4(const char *path, rct1_s4 *s4) { diff --git a/src/rct1/S4Importer.cpp b/src/rct1/S4Importer.cpp index 52a0a3d776..ac654b2311 100644 --- a/src/rct1/S4Importer.cpp +++ b/src/rct1/S4Importer.cpp @@ -6,7 +6,7 @@ #include "../core/Path.hpp" #include "../core/String.hpp" #include "../core/Util.hpp" -#include "import.h" +#include "Tables.h" extern "C" { diff --git a/src/rct1/import.h b/src/rct1/Tables.h similarity index 100% rename from src/rct1/import.h rename to src/rct1/Tables.h diff --git a/src/rct1/tables.cpp b/src/rct1/tables.cpp index 36fa61e170..6a49303cc3 100644 --- a/src/rct1/tables.cpp +++ b/src/rct1/tables.cpp @@ -1,7 +1,7 @@ #include "../common.h" #include "../core/List.hpp" #include "../core/Util.hpp" -#include "import.h" +#include "Tables.h" extern "C" {