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

fix merge problems

This commit is contained in:
IntelOrca 2014-09-19 22:17:14 +01:00
parent 828dabc9be
commit 2d2face52a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ride.c
View File

@ -600,10 +600,10 @@ void ride_init_vehicle_speed(rct_ride *ride)
int ecx = -1;
while (1) {
ecx++;
if (ecx >= ride->var_0C8) {
if (ecx >= ride->num_vehicles) {
break;
}
rct_vehicle *vehicle = &g_sprite_list[ride->train_car_map[ecx]].vehicle;
rct_vehicle *vehicle = &g_sprite_list[ride->vehicles[ecx]].vehicle;
vehicle->var_48 &= (1 << 6);
uint8 r = scenario_rand();
r = 0xC;

4
src/vehicle.c
View File

@ -89,7 +89,7 @@ void sub_6BB9FF(rct_vehicle* vehicle)
v18 = 64;
}
i->var_4 = (sint16)(((v15.both / v18) - 0x8000) >> 4);
sint32 v19 = vehicle->var_28;
sint32 v19 = vehicle->velocity;
int testaddr = (vehicle->var_31 * 0x65);
testaddr += (int)RCT2_ADDRESS(0x009ACFA4, rct_ride_type*)[vehicle->var_D6];
@ -138,7 +138,7 @@ int sub_6BC2F3(rct_vehicle* vehicle)
do {
result += vehicle_temp->var_46;
} while (vehicle_temp->next_vehicle_on_train != (uint16)-1 && (vehicle_temp = GET_VEHICLE(vehicle_temp->next_vehicle_on_train)));
sint32 v4 = vehicle->var_28;
sint32 v4 = vehicle->velocity;
if (v4 < 0) {
v4 = -v4;
}

2
src/vehicle.h
View File

@ -48,7 +48,7 @@ typedef struct {
rct_widthheight view; // 0x1A
uint16 var_1E;
uint8 pad_20[0x08];
sint32 velocity;
sint32 velocity; // 0x28
uint8 pad_2C[0x04];
uint8 ride; // 0x30
uint8 var_31;