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

Fix TD4 vehicle colour import, move track_design to C++

This commit is contained in:
Michael Steenbeek 2017-09-01 13:38:21 +02:00 committed by GitHub
parent c40b73d5a4
commit ddb557a0fe
8 changed files with 1003 additions and 595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRCT2.xcodeproj/project.pbxproj
View File

@ -21,6 +21,7 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
4C4C1E981F58226500560300 /* TrackDesign.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C4C1E971F58226500560300 /* TrackDesign.cpp */; };
4C8667821EEFDCDF0024AAB8 /* RideGroupManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */; };
4C8B42701EEB1ABD00F015CA /* X8DrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */; };
4C8B42721EEB1AE400F015CA /* HardwareDisplayDrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B42711EEB1AE400F015CA /* HardwareDisplayDrawingEngine.cpp */; };
@ -369,7 +370,6 @@
F76C87121EC4E88400FA49E2 /* track.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84D21EC4E7CC00FA49E2 /* track.c */; };
F76C87141EC4E88400FA49E2 /* track_data.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84D41EC4E7CC00FA49E2 /* track_data.c */; };
F76C87161EC4E88400FA49E2 /* track_data_old.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84D61EC4E7CC00FA49E2 /* track_data_old.c */; };
F76C87171EC4E88400FA49E2 /* track_design.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84D71EC4E7CC00FA49E2 /* track_design.c */; };
F76C87191EC4E88400FA49E2 /* track_design_save.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84D91EC4E7CD00FA49E2 /* track_design_save.c */; };
F76C871A1EC4E88400FA49E2 /* track_paint.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84DA1EC4E7CD00FA49E2 /* track_paint.c */; };
F76C871C1EC4E88400FA49E2 /* TrackDesignRepository.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84DC1EC4E7CD00FA49E2 /* TrackDesignRepository.cpp */; };
@ -590,6 +590,8 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
4C4C1E971F58226500560300 /* TrackDesign.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackDesign.cpp; sourceTree = "<group>"; };
4C4C1E991F5832AA00560300 /* TrackDesign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackDesign.h; sourceTree = "<group>"; };
4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideGroupManager.cpp; sourceTree = "<group>"; };
4C8667811EEFDCDF0024AAB8 /* RideGroupManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideGroupManager.h; sourceTree = "<group>"; };
4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = X8DrawingEngine.cpp; sourceTree = "<group>"; };
@ -1246,8 +1248,6 @@
F76C84D41EC4E7CC00FA49E2 /* track_data.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = track_data.c; sourceTree = "<group>"; };
F76C84D51EC4E7CC00FA49E2 /* track_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = track_data.h; sourceTree = "<group>"; };
F76C84D61EC4E7CC00FA49E2 /* track_data_old.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = track_data_old.c; sourceTree = "<group>"; };
F76C84D71EC4E7CC00FA49E2 /* track_design.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = track_design.c; sourceTree = "<group>"; };
F76C84D81EC4E7CC00FA49E2 /* track_design.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = track_design.h; sourceTree = "<group>"; };
F76C84D91EC4E7CD00FA49E2 /* track_design_save.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = track_design_save.c; sourceTree = "<group>"; };
F76C84DA1EC4E7CD00FA49E2 /* track_paint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = track_paint.c; sourceTree = "<group>"; };
F76C84DB1EC4E7CD00FA49E2 /* track_paint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = track_paint.h; sourceTree = "<group>"; };
@ -2230,11 +2230,11 @@
F76C84D41EC4E7CC00FA49E2 /* track_data.c */,
F76C84D51EC4E7CC00FA49E2 /* track_data.h */,
F76C84D61EC4E7CC00FA49E2 /* track_data_old.c */,
F76C84D71EC4E7CC00FA49E2 /* track_design.c */,
F76C84D81EC4E7CC00FA49E2 /* track_design.h */,
F76C84D91EC4E7CD00FA49E2 /* track_design_save.c */,
F76C84DA1EC4E7CD00FA49E2 /* track_paint.c */,
F76C84DB1EC4E7CD00FA49E2 /* track_paint.h */,
4C4C1E971F58226500560300 /* TrackDesign.cpp */,
4C4C1E991F5832AA00560300 /* TrackDesign.h */,
F76C84DC1EC4E7CD00FA49E2 /* TrackDesignRepository.cpp */,
F76C84DD1EC4E7CD00FA49E2 /* TrackDesignRepository.h */,
F76C84E41EC4E7CD00FA49E2 /* vehicle.c */,
@ -3029,6 +3029,7 @@
F76C887A1EC5324E00FA49E2 /* AudioMixer.cpp in Sources */,
F76C887B1EC5324E00FA49E2 /* FileAudioSource.cpp in Sources */,
C64644FD1F3FA4120026AC2D /* Land.cpp in Sources */,
4C4C1E981F58226500560300 /* TrackDesign.cpp in Sources */,
C666EE6B1F37ACB10061AA04 /* About.cpp in Sources */,
C666ED771F33DBB20061AA04 /* ShortcutKeys.cpp in Sources */,
C666EE6C1F37ACB10061AA04 /* Changelog.cpp in Sources */,
@ -3345,7 +3346,6 @@
F76C87141EC4E88400FA49E2 /* track_data.c in Sources */,
C666EE511F33E3800061AA04 /* TrackPlace.cpp in Sources */,
F76C87161EC4E88400FA49E2 /* track_data_old.c in Sources */,
F76C87171EC4E88400FA49E2 /* track_design.c in Sources */,
F76C87191EC4E88400FA49E2 /* track_design_save.c in Sources */,
F76C871A1EC4E88400FA49E2 /* track_paint.c in Sources */,
F76C871C1EC4E88400FA49E2 /* TrackDesignRepository.cpp in Sources */,

2
src/openrct2/game.c
View File

@ -42,7 +42,7 @@
#include "ride/ride.h"
#include "ride/ride_ratings.h"
#include "ride/track.h"
#include "ride/track_design.h"
#include "ride/TrackDesign.h"
#include "ride/vehicle.h"
#include "scenario/scenario.h"
#include "title/TitleScreen.h"

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

@ -22,7 +22,7 @@
#include "../management/research.h"
#include "../peep/peep.h"
#include "../ride/ride.h"
#include "../ride/track_design.h"
#include "../ride/TrackDesign.h"
#include "../ride/vehicle.h"
#include "../scenario/scenario.h"
#include "../world/park.h"

1574
src/openrct2/ride/track_design.c → src/openrct2/ride/TrackDesign.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/openrct2/ride/track_design.h → src/openrct2/ride/TrackDesign.h
View File

@ -213,7 +213,7 @@ void track_design_dispose(rct_track_td6 *td6);
void track_design_mirror(rct_track_td6 *td6);
sint32 place_virtual_track(rct_track_td6 *td6, uint8 ptdOperation, bool placeScenery, uint8 rideIndex, sint32 x, sint32 y, sint32 z);
sint32 place_virtual_track(rct_track_td6 *td6, uint8 ptdOperation, bool placeScenery, uint8 rideIndex, sint16 x, sint16 y, sint16 z);
void game_command_place_track_design(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp);
void game_command_place_maze_design(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp);

2
src/openrct2/ride/TrackDesignRepository.cpp
View File

@ -33,7 +33,7 @@
extern "C"
{
#include "track_design.h"
#include "TrackDesign.h"
}
using namespace OpenRCT2;

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

@ -27,7 +27,7 @@
#include "ride_data.h"
#include "track.h"
#include "track_data.h"
#include "track_design.h"
#include "TrackDesign.h"
#include "TrackDesignRepository.h"
#define TRACK_MAX_SAVED_MAP_ELEMENTS 1500

2
src/openrct2/world/SmallScenery.cpp
View File

@ -24,7 +24,7 @@ extern "C"
#include "map.h"
#include "park.h"
#include "../cheats.h"
#include "../ride/track_design.h"
#include "../ride/TrackDesign.h"
}
static money32 SmallSceneryRemove(sint16 x, sint16 y, uint8 baseHeight, uint8 quadrant, uint8 sceneryType, uint8 flags)