mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Added more of sub_state_0

Browse Source
This commit is contained in:
Duncan Frost
2015-03-16 21:37:21 +00:00
parent 889f208f10
commit 6855f83b01
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/peep/peep.c
View File

@@ -883,8 +883,34 @@ static void peep_leaving_ride_sub_state_0(rct_peep* peep){
}
peep->current_train = chosen_train;
uint8* edx = RCT2_ADDRESS(0xF1AD78, uint8);
rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[chosen_train]);
int i = 0;
for (rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[chosen_train]);
vehicle->next_vehicle_on_train != 0xFFFF;
vehicle = GET_VEHICLE(vehicle->next_vehicle_on_train),
i++){
uint8 al = vehicle->var_B2;
if (al & 0x80){
al &= ~0x80;
if (vehicle->var_B4 & 1){
//goto 0x691CCE
}
}
if (al == vehicle->var_B4)
continue;
if (ride->mode == RIDE_MODE_FORWARD_ROTATION ||
ride->mode == RIDE_MODE_BACKWARD_ROTATION)
{
uint8 position = ((~vehicle->var_1F + 1) >> 3) & 0xF;
if (vehicle->peep[position] != 0xFFFF)
continue;
}
*edx++ = i;
}
// 0x00691B36
}

3
src/ride/vehicle.h
View File

@@ -46,7 +46,8 @@ typedef struct {
sint16 sprite_right; // 0x1A
sint16 sprite_bottom; // 0x1C
uint8 sprite_direction; // 0x1E
uint8 pad_1F[0x09];
uint8 var_1F;
uint8 pad_20[0x08];
sint32 velocity; // 0x28
uint8 pad_2C[0x04];
uint8 ride; // 0x30