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

Merge pull request #6442 from janisozaur/vehicle-cpp 

Compile vehicle.c as C++
This commit is contained in:
Michael Steenbeek 2017-10-16 17:15:43 +02:00 committed by GitHub
parent 9d5c6a4127 9ca73ffde2
commit 6a66ef8668
12 changed files with 3428 additions and 2674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRCT2.xcodeproj/project.pbxproj
View File

@ -114,6 +114,7 @@
4CFE4E801F90A3F1005243C2 /* Peep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE4E7B1F90A3F1005243C2 /* Peep.cpp */; };
4CFE4E811F90A3F1005243C2 /* PeepData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE4E7D1F90A3F1005243C2 /* PeepData.cpp */; };
4CFE4E821F90A3F1005243C2 /* Staff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE4E7E1F90A3F1005243C2 /* Staff.cpp */; };
4CFE4E851F90AF41005243C2 /* Vehicle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE4E831F90AF41005243C2 /* Vehicle.cpp */; };
C606CCBE1DB4054000FE4015 /* compat.c in Sources */ = {isa = PBXBuildFile; fileRef = C606CCAB1DB4054000FE4015 /* compat.c */; };
C606CCBF1DB4054000FE4015 /* data.c in Sources */ = {isa = PBXBuildFile; fileRef = C606CCAC1DB4054000FE4015 /* data.c */; };
C606CCC01DB4054000FE4015 /* FunctionCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CCAE1DB4054000FE4015 /* FunctionCall.cpp */; };
@ -407,7 +408,6 @@
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 */; };
F76C87231EC4E88400FA49E2 /* vehicle.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84E41EC4E7CD00FA49E2 /* vehicle.c */; };
F76C87251EC4E88400FA49E2 /* vehicle_data.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84E61EC4E7CD00FA49E2 /* vehicle_data.c */; };
F76C87271EC4E88400FA49E2 /* vehicle_paint.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84E81EC4E7CD00FA49E2 /* vehicle_paint.c */; };
F76C87311EC4E88400FA49E2 /* scenario.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84F41EC4E7CD00FA49E2 /* scenario.c */; };
@ -718,6 +718,8 @@
4CFE4E7D1F90A3F1005243C2 /* PeepData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PeepData.cpp; sourceTree = "<group>"; };
4CFE4E7E1F90A3F1005243C2 /* Staff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Staff.cpp; sourceTree = "<group>"; };
4CFE4E7F1F90A3F1005243C2 /* Staff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Staff.h; sourceTree = "<group>"; };
4CFE4E831F90AF41005243C2 /* Vehicle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vehicle.cpp; sourceTree = "<group>"; };
4CFE4E841F90AF41005243C2 /* Vehicle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vehicle.h; sourceTree = "<group>"; };
C606CCAB1DB4054000FE4015 /* compat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = compat.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
C606CCAC1DB4054000FE4015 /* data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = data.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
C606CCAD1DB4054000FE4015 /* data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = data.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@ -1308,8 +1310,6 @@
F76C84DB1EC4E7CD00FA49E2 /* track_paint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = track_paint.h; sourceTree = "<group>"; };
F76C84DC1EC4E7CD00FA49E2 /* TrackDesignRepository.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TrackDesignRepository.cpp; sourceTree = "<group>"; };
F76C84DD1EC4E7CD00FA49E2 /* TrackDesignRepository.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TrackDesignRepository.h; sourceTree = "<group>"; };
F76C84E41EC4E7CD00FA49E2 /* vehicle.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = vehicle.c; sourceTree = "<group>"; };
F76C84E51EC4E7CD00FA49E2 /* vehicle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = vehicle.h; sourceTree = "<group>"; };
F76C84E61EC4E7CD00FA49E2 /* vehicle_data.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = vehicle_data.c; sourceTree = "<group>"; };
F76C84E71EC4E7CD00FA49E2 /* vehicle_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = vehicle_data.h; sourceTree = "<group>"; };
F76C84E81EC4E7CD00FA49E2 /* vehicle_paint.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = vehicle_paint.c; sourceTree = "<group>"; };
@ -2336,8 +2336,8 @@
4C4C1E991F5832AA00560300 /* TrackDesign.h */,
F76C84DC1EC4E7CD00FA49E2 /* TrackDesignRepository.cpp */,
F76C84DD1EC4E7CD00FA49E2 /* TrackDesignRepository.h */,
F76C84E41EC4E7CD00FA49E2 /* vehicle.c */,
F76C84E51EC4E7CD00FA49E2 /* vehicle.h */,
4CFE4E831F90AF41005243C2 /* Vehicle.cpp */,
4CFE4E841F90AF41005243C2 /* Vehicle.h */,
F76C84E61EC4E7CD00FA49E2 /* vehicle_data.c */,
F76C84E71EC4E7CD00FA49E2 /* vehicle_data.h */,
F76C84E81EC4E7CD00FA49E2 /* vehicle_paint.c */,
@ -3206,6 +3206,7 @@
C666EE7B1F37ACB10061AA04 /* TitleExit.cpp in Sources */,
F7D7747F1EC61E5100BE6EBC /* UiContext.macOS.mm in Sources */,
F76C887E1EC5324E00FA49E2 /* CursorRepository.cpp in Sources */,
4CFE4E851F90AF41005243C2 /* Vehicle.cpp in Sources */,
4C93F16A1F8B745700A9330D /* CarRide.cpp in Sources */,
C654DF331F69C0430040F43D /* LoadSave.cpp in Sources */,
F775F5341EE35A6B001F00E7 /* DummyUiContext.cpp in Sources */,
@ -3476,7 +3477,6 @@
F76C87191EC4E88400FA49E2 /* track_design_save.c in Sources */,
F76C871A1EC4E88400FA49E2 /* track_paint.c in Sources */,
F76C871C1EC4E88400FA49E2 /* TrackDesignRepository.cpp in Sources */,
F76C87231EC4E88400FA49E2 /* vehicle.c in Sources */,
F76C87251EC4E88400FA49E2 /* vehicle_data.c in Sources */,
F76C87271EC4E88400FA49E2 /* vehicle_paint.c in Sources */,
C666EE391F33E3800061AA04 /* RideConstruction.cpp in Sources */,

2
src/openrct2/game.c
View File

@ -43,7 +43,7 @@
#include "ride/ride_ratings.h"
#include "ride/track.h"
#include "ride/TrackDesign.h"
#include "ride/vehicle.h"
#include "ride/Vehicle.h"
#include "scenario/scenario.h"
#include "title/TitleScreen.h"
#include "util/sawyercoding.h"

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

@ -23,7 +23,7 @@
#include "../peep/Peep.h"
#include "../ride/ride.h"
#include "../ride/TrackDesign.h"
#include "../ride/vehicle.h"
#include "../ride/Vehicle.h"
#include "../scenario/scenario.h"
#include "../world/park.h"
#include "colour.h"

2
src/openrct2/rct2.h
View File

@ -18,7 +18,7 @@
#define _RCT2_H_
#include "ride/ride_ratings.h"
#include "ride/vehicle.h"
#include "ride/Vehicle.h"
#include "common.h"
#include "rct12.h"

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

@ -22,7 +22,7 @@
#include "../rct12.h"
#include "../rct2.h"
#include "../world/map.h"
#include "vehicle.h"
#include "Vehicle.h"
#define TRACK_PREVIEW_IMAGE_SIZE (370 * 217)

6058
src/openrct2/ride/vehicle.c → src/openrct2/ride/Vehicle.cpp
View File

File diff suppressed because it is too large Load Diff

0
src/openrct2/ride/vehicle.h → src/openrct2/ride/Vehicle.h
View File

10
src/openrct2/ride/cable_lift.h
View File

@ -18,10 +18,18 @@
#define _CABLE_LIFT_H_
#include "../common.h"
#include "vehicle.h"
#include "Vehicle.h"
#ifdef __cplusplus
extern "C" {
#endif
rct_vehicle *cable_lift_segment_create(sint32 rideIndex, sint32 x, sint32 y, sint32 z, sint32 direction, uint16 var_44, sint32 remaining_distance, bool head);
void cable_lift_update(rct_vehicle *vehicle);
sint32 cable_lift_update_track_motion(rct_vehicle *cableLift);
#ifdef __cplusplus
}
#endif
#endif

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

@ -23,7 +23,7 @@
#include "../rct2.h"
#include "../world/map.h"
#include "ride_ratings.h"
#include "vehicle.h"
#include "Vehicle.h"
#define MAX_RIDE_TYPES_PER_RIDE_ENTRY 3
// The max number of different types of vehicle.

8
src/openrct2/ride/vehicle_data.h
View File

@ -19,6 +19,10 @@
#include "../common.h"
#ifdef __cplusplus
extern "C" {
#endif
extern const uint8 * Rotation1TimeToSpriteMaps[];
extern const uint8 * Rotation2TimeToSpriteMaps[];
extern const uint8 * Rotation3TimeToSpriteMaps[];
@ -38,4 +42,8 @@ extern const sint32 dword_9A2970[];
extern const sint32 word_9A3684[];
#ifdef __cplusplus
}
#endif
#endif

2
src/openrct2/ride/vehicle_paint.h
View File

@ -17,7 +17,7 @@
#ifndef _VEHICLE_PAINT_H
#define _VEHICLE_PAINT_H
#include "vehicle.h"
#include "Vehicle.h"
#ifdef __cplusplus
extern "C" {

2
src/openrct2/world/sprite.h
View File

@ -19,7 +19,7 @@
#include "../common.h"
#include "../peep/Peep.h"
#include "../ride/vehicle.h"
#include "../ride/Vehicle.h"
#define SPRITE_INDEX_NULL 0xFFFF
#define MAX_SPRITES 10000