mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Added start of sub_state_7

Browse Source
This commit is contained in:
Duncan Frost
2015-03-21 15:29:53 +00:00
parent 3ce979504a
commit ddfdfd37be
5 changed files with 145 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ride/ride.c
View File

@@ -1884,7 +1884,7 @@ void ride_measurement_update(rct_ride_measurement *measurement)
return;
measurement->flags &= ~RIDE_MEASUREMENT_FLAG_UNLOADING;
if (measurement->var_0B == vehicle->var_4B)
if (measurement->current_station == vehicle->current_station)
measurement->current_item = 0;
}
@@ -1968,7 +1968,7 @@ void ride_measurements_update()
vehicle = &(g_sprite_list[spriteIndex].vehicle);
if (vehicle->status == VEHICLE_STATUS_DEPARTING || vehicle->status == VEHICLE_STATUS_STOPPING) {
measurement->vehicle_index = j;
measurement->var_0B = vehicle->var_4B;
measurement->current_station = vehicle->current_station;
measurement->flags |= RIDE_MEASUREMENT_FLAG_RUNNING;
measurement->flags &= ~RIDE_MEASUREMENT_FLAG_UNLOADING;
ride_measurement_update(measurement);

2
src/ride/ride.h
View File

@@ -318,7 +318,7 @@ typedef struct {
uint16 num_items; // 0x0006
uint16 current_item; // 0x0008
uint8 vehicle_index; // 0x000A
uint8 var_0B;
uint8 current_station; // 0x000B
sint8 vertical[RIDE_MEASUREMENT_MAX_ITEMS]; // 0x000C
sint8 lateral[RIDE_MEASUREMENT_MAX_ITEMS]; // 0x12CC
uint8 velocity[RIDE_MEASUREMENT_MAX_ITEMS]; // 0x258C

6
src/ride/vehicle.h
View File

@@ -55,7 +55,9 @@ typedef struct {
uint8 pad_32[0x02];
uint16 var_34;
sint16 var_36;
uint8 pad_38[0x06];
uint16 var_38;
uint16 var_3A;
uint16 var_3C;
uint16 next_vehicle_on_train; // 0x3E
uint16 prev_vehicle_on_train; // 0x40
uint16 pad_42;
@@ -63,7 +65,7 @@ typedef struct {
uint16 var_46;
uint16 var_48;
uint8 pad_4A;
uint8 var_4B;
uint8 current_station; // 0x4B
uint8 pad_4C[0x4];
uint8 status; // 0x50
uint8 var_51;