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

Remove redundant callproc code / comments.

This commit is contained in:
duncanspumpkin 2016-02-14 09:34:30 +00:00
parent 0cbc8d9372
commit 843b588b15
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ride/ride.c
View File

@ -4590,9 +4590,6 @@ void ride_create_vehicles_find_first_block(rct_ride *ride, rct_xy_element *outXY
*/
bool ride_create_vehicles(rct_ride *ride, int rideIndex, rct_xy_element *element, int isApplying)
{
// bool b = !(RCT2_CALLPROC_X(0x006DD84C, element->x, isApplying, element->y, rideIndex, (int)ride, (int)element->element, 0) & 0x100);
// return b;
ride_update_max_vehicles(rideIndex);
if (ride->subtype == 0xFF) {
return true;

13
src/ride/track.c
View File

@ -1989,19 +1989,6 @@ int sub_6D01B3(uint8 bl, uint8 rideIndex, int x, int y, int z)
if (bl == 3)
return RCT2_GLOBAL(0x00F440D5, sint16);
return RCT2_GLOBAL(0x00F440D5, money32);
int eax, ebx, ecx, edx, esi, edi, ebp;
eax = x;
ebx = bl;
ecx = y;
edx = z;
esi = 0;
edi = 0;
ebp = 0;
RCT2_CALLFUNC_X(0x006D01B3, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
if (bl == 3)
ebx &= 0xFFFF;
return ebx;
}
/**

10
src/ride/vehicle.c
View File

@ -3196,7 +3196,6 @@ static void loc_6DA9F9(rct_vehicle *vehicle, int x, int y, int bx, int dx)
*/
static void vehicle_update_motion_boat_hire(rct_vehicle *vehicle)
{
// RCT2_CALLPROC_X(0x006DA717, 0, 0, 0, 0, (int)vehicle, 0, 0);
RCT2_GLOBAL(0x00F64E18, uint32) = 0;
vehicle->velocity += vehicle->acceleration;
RCT2_GLOBAL(0x00F64E08, sint32) = vehicle->velocity;
@ -4945,15 +4944,6 @@ void vehicle_get_g_forces(rct_vehicle *vehicle, int *verticalG, int *lateralG)
gForceVert >>= 16;
gForceLateral >>= 16;
// Call original version so we can test if our result is the same as the original
int eax, ebx, ecx, edx, esi, edi, ebp;
esi = (int)vehicle;
RCT2_CALLFUNC_X(0x006D73D0, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
if (gForceVert != (sint16)(eax & 0xFFFF))
assert(gForceVert == (sint16)(eax & 0xFFFF));
if (gForceLateral != (sint16)(edx & 0xFFFF))
assert(gForceLateral == (sint16)(edx & 0xFFFF));
if (verticalG != NULL) *verticalG = (sint16)(gForceVert & 0xFFFF);
if (lateralG != NULL) *lateralG = (sint16)(gForceLateral & 0xFFFF);
}