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

Integrate addresses of old paint functions

This commit is contained in:
Marijn van der Werf 2016-09-13 21:25:06 +02:00 committed by Ted John
parent c3da4f0ecc
commit d3b7a0cbb9
6 changed files with 19380 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRCT2.xcodeproj/project.pbxproj
View File

@ -17,6 +17,7 @@
008BF72C1CDAA5C30019A2AD /* track_design.c in Sources */ = {isa = PBXBuildFile; fileRef = 008BF7281CDAA5C30019A2AD /* track_design.c */; };
00EFEE721CF1D80B0035213B /* NetworkKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00EFEE701CF1D80B0035213B /* NetworkKey.cpp */; };
791166FB1D7486EF005912EA /* NetworkServerAdvertiser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 791166F91D7486EF005912EA /* NetworkServerAdvertiser.cpp */; };
8594C0601D885CF600235E93 /* track_data_old.c in Sources */ = {isa = PBXBuildFile; fileRef = 8594C05F1D885CF600235E93 /* track_data_old.c */; };
C612A8991D64825300B634CA /* vehicle_data.c in Sources */ = {isa = PBXBuildFile; fileRef = C612A8971D64825300B634CA /* vehicle_data.c */; };
C61FB7201CF6180C004CE991 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D45A38BA1CF3006400659A24 /* libssl.dylib */; };
C61FB7211CF618BA004CE991 /* libssl.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D45A38BA1CF3006400659A24 /* libssl.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@ -395,6 +396,7 @@
00EFEE711CF1D80B0035213B /* NetworkKey.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = NetworkKey.h; sourceTree = "<group>"; usesTabs = 0; };
791166F91D7486EF005912EA /* NetworkServerAdvertiser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkServerAdvertiser.cpp; sourceTree = "<group>"; };
791166FA1D7486EF005912EA /* NetworkServerAdvertiser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkServerAdvertiser.h; sourceTree = "<group>"; };
8594C05F1D885CF600235E93 /* track_data_old.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = track_data_old.c; sourceTree = "<group>"; };
C612A8971D64825300B634CA /* vehicle_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vehicle_data.c; sourceTree = "<group>"; };
C612A8981D64825300B634CA /* vehicle_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vehicle_data.h; sourceTree = "<group>"; };
C61FB7221CF86356004CE991 /* NetworkUser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkUser.cpp; sourceTree = "<group>"; usesTabs = 0; };
@ -1562,6 +1564,7 @@
D44271721CC81B3200D84D28 /* ride.h */,
D44271771CC81B3200D84D28 /* station.c */,
D44271781CC81B3200D84D28 /* station.h */,
8594C05F1D885CF600235E93 /* track_data_old.c */,
D442717B1CC81B3200D84D28 /* track_data.c */,
D442717C1CC81B3200D84D28 /* track_data.h */,
008BF7261CDAA5C30019A2AD /* track_design_index.c */,
@ -2389,6 +2392,7 @@
D464FEF41D31A6AA00CBABAC /* WallObject.cpp in Sources */,
D44272011CC81B3200D84D28 /* Guard.cpp in Sources */,
D43407E01D0E14BE00C2B3D4 /* TextureCache.cpp in Sources */,
8594C0601D885CF600235E93 /* track_data_old.c in Sources */,
D44272951CC81B3200D84D28 /* track_manage.c in Sources */,
D44272851CC81B3200D84D28 /* staff.c in Sources */,
D442725F1CC81B3200D84D28 /* editor_scenario_options.c in Sources */,

1
openrct2.vcxproj
View File

@ -239,6 +239,7 @@
<ClCompile Include="src\ride\thrill\twist.c" />
<ClCompile Include="src\ride\track.c" />
<ClCompile Include="src\ride\track_data.c" />
<ClCompile Include="src\ride\track_data_old.c" />
<ClCompile Include="src\ride\track_design.c" />
<ClCompile Include="src\ride\track_design_save.c" />
<ClCompile Include="src\ride\track_design_index.c" />

95
src/ride/track_data.c
View File

@ -6240,101 +6240,6 @@ const track_curve_chain gFlatRideTrackCurveChain[256] = {
{ 0, 57088 },
};
const uint32 RideTypeTrackPaintFunctionsOld[91] = {
0x008A42F4, // RIDE_TYPE_SPIRAL_ROLLER_COASTER
0x008A6DB0, // RIDE_TYPE_STAND_UP_ROLLER_COASTER
0x008A85E4, // RIDE_TYPE_SUSPENDED_SWINGING_COASTER
0x008A8EE4, // RIDE_TYPE_INVERTED_ROLLER_COASTER
0x008AAA0C, // RIDE_TYPE_JUNIOR_ROLLER_COASTER
0x008ACE48, // RIDE_TYPE_MINIATURE_RAILWAY
0x008ADF34, // RIDE_TYPE_MONORAIL
0x008AFC24, // RIDE_TYPE_MINI_SUSPENDED_COASTER
0x008B0D60, // RIDE_TYPE_BOAT_RIDE
0x008A534C, // RIDE_TYPE_WOODEN_WILD_MOUSE
0x008A5634, // RIDE_TYPE_STEEPLECHASE
0x006F7000, // RIDE_TYPE_CAR_RIDE
0x006FD0E8, // RIDE_TYPE_LAUNCHED_FREEFALL
0x006FE240, // RIDE_TYPE_BOBSLEIGH_COASTER
0x0070DC5C, // RIDE_TYPE_OBSERVATION_TOWER
0x008A5B88, // RIDE_TYPE_LOOPING_ROLLER_COASTER
0x0070EDB4, // RIDE_TYPE_DINGHY_SLIDE
0x0071BC40, // RIDE_TYPE_MINE_TRAIN_COASTER
0x00743EC8, // RIDE_TYPE_CHAIRLIFT
0x008A7784, // RIDE_TYPE_CORKSCREW_ROLLER_COASTER
0x008A81E8, // RIDE_TYPE_MAZE
0x0074840C, // RIDE_TYPE_SPIRAL_SLIDE
0x0074A668, // RIDE_TYPE_GO_KARTS
0x0074DDEC, // RIDE_TYPE_LOG_FLUME
0x0075745C, // RIDE_TYPE_RIVER_RAPIDS
0x0075C9D0, // RIDE_TYPE_DODGEMS
0x008A83E0, // RIDE_TYPE_PIRATE_SHIP
0x00760070, // RIDE_TYPE_SWINGING_INVERTER_SHIP
0x00761160, // RIDE_TYPE_FOOD_STALL
0x00761160, // RIDE_TYPE_1D
0x00761160, // RIDE_TYPE_DRINK_STALL
0x00761160, // RIDE_TYPE_1F
0x00761160, // RIDE_TYPE_SHOP
0x0076190C, // RIDE_TYPE_MERRY_GO_ROUND
0x00761160, // RIDE_TYPE_22
0x00761160, // RIDE_TYPE_INFORMATION_KIOSK
0x00762D44, // RIDE_TYPE_TOILETS
0x008A8CC8, // RIDE_TYPE_FERRIS_WHEEL
0x00763520, // RIDE_TYPE_MOTION_SIMULATOR
0x0076554C, // RIDE_TYPE_3D_CINEMA
0x0076659C, // RIDE_TYPE_TOP_SPIN
0x00767A40, // RIDE_TYPE_SPACE_RINGS
0x00768BAC, // RIDE_TYPE_REVERSE_FREEFALL_COASTER
0x0076C5BC, // RIDE_TYPE_LIFT
0x008A9C08, // RIDE_TYPE_VERTICAL_DROP_ROLLER_COASTER
0x00761160, // RIDE_TYPE_CASH_MACHINE
0x0076D658, // RIDE_TYPE_TWIST
0x0076E7B0, // RIDE_TYPE_HAUNTED_HOUSE
0x00762D44, // RIDE_TYPE_FIRST_AID
0x0076F8D4, // RIDE_TYPE_CIRCUS_SHOW
0x00770924, // RIDE_TYPE_GHOST_TRAIN
0x008AB2A0, // RIDE_TYPE_TWISTER_ROLLER_COASTER
0x008AC164, // RIDE_TYPE_WOODEN_ROLLER_COASTER
0x00778124, // RIDE_TYPE_SIDE_FRICTION_ROLLER_COASTER
0x0078AE80, // RIDE_TYPE_WILD_MOUSE
0x00792978, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER
0x00792978, // RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT
0x007C6C00, // RIDE_TYPE_FLYING_ROLLER_COASTER
0x007C6C00, // RIDE_TYPE_FLYING_ROLLER_COASTER_ALT
0x00811184, // RIDE_TYPE_VIRGINIA_REEL
0x008164AC, // RIDE_TYPE_SPLASH_BOATS
0x0081F268, // RIDE_TYPE_MINI_HELICOPTERS
0x008245A8, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER
0x0086347C, // RIDE_TYPE_SUSPENDED_MONORAIL
0x008245A8, // RIDE_TYPE_LAY_DOWN_ROLLER_COASTER_ALT
0x0086E2F8, // RIDE_TYPE_REVERSER_ROLLER_COASTER
0x00876618, // RIDE_TYPE_HEARTLINE_TWISTER_COASTER
0x0087EDC4, // RIDE_TYPE_MINI_GOLF
0x008AD280, // RIDE_TYPE_GIGA_COASTER
0x00886074, // RIDE_TYPE_ROTO_DROP
0x00887208, // RIDE_TYPE_FLYING_SAUCERS
0x00889C28, // RIDE_TYPE_CROOKED_HOUSE
0x0088AC88, // RIDE_TYPE_MONORAIL_CYCLES
0x008AE36C, // RIDE_TYPE_COMPACT_INVERTED_COASTER
0x008AEDE0, // RIDE_TYPE_WATER_COASTER
0x008AF764, // RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER
0x00890940, // RIDE_TYPE_INVERTED_HAIRPIN_COASTER
0x00898384, // RIDE_TYPE_MAGIC_CARPET
0x008995D4, // RIDE_TYPE_SUBMARINE_RIDE
0x0089B0C0, // RIDE_TYPE_RIVER_RAFTS
0x00761160, // RIDE_TYPE_50
0x008A13B4, // RIDE_TYPE_ENTERPRISE
0x00761160, // RIDE_TYPE_52
0x00761160, // RIDE_TYPE_53
0x00761160, // RIDE_TYPE_54
0x00000000, // RIDE_TYPE_55
0x008B005C, // RIDE_TYPE_INVERTED_IMPULSE_COASTER
0x008A46D8, // RIDE_TYPE_MINI_ROLLER_COASTER
0x008B0610, // RIDE_TYPE_MINE_RIDE
0x00000000, // RIDE_TYPE_59
0x008A5F6C, // RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER
};
const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[91] = {
0, // RIDE_TYPE_SPIRAL_ROLLER_COASTER
0, // RIDE_TYPE_STAND_UP_ROLLER_COASTER

2
src/ride/track_data.h
View File

@ -41,7 +41,7 @@ extern const track_curve_chain gTrackCurveChain[256];
extern const track_curve_chain gFlatRideTrackCurveChain[256];
extern const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[91];
extern const uint32 RideTypeTrackPaintFunctionsOld[91];
extern const uint32 * RideTypeTrackPaintFunctionsOld[91];
typedef struct track_descriptor {
bool starts_diagonal;

19361
src/ride/track_data_old.c Normal file
View File

File diff suppressed because it is too large Load Diff

25
src/ride/track_paint.c
View File

@ -1335,20 +1335,21 @@ void track_paint(uint8 direction, int height, rct_map_element *mapElement)
}
else {
#ifndef NO_RCT2
TRACK_PAINT_FUNCTION **trackTypeList = (TRACK_PAINT_FUNCTION**)RideTypeTrackPaintFunctionsOld[rideType];
uint32 *trackDirectionList = (uint32*)trackTypeList[trackType];
uint32 *trackDirectionList = (uint32 *)RideTypeTrackPaintFunctionsOld[rideType][trackType];
// Have to call from this point as it pushes esi and expects callee to pop it
RCT2_CALLPROC_X(
0x006C4934,
rideType,
(int)trackDirectionList,
direction,
height,
(int)mapElement,
rideIndex * sizeof(rct_ride),
trackSequence
if (trackDirectionList != NULL) {
// Have to call from this point as it pushes esi and expects callee to pop it
RCT2_CALLPROC_X(
0x006C4934,
rideType,
(int)trackDirectionList,
direction,
height,
(int)mapElement,
rideIndex * sizeof(rct_ride),
trackSequence
);
}
#endif
}
}