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

Started peep_update_ride_sub_state_1. Labelled known functions/offsets

This commit is contained in:
Duncan Frost 2015-03-19 20:34:53 +00:00
parent 0d861c6bc9
commit 37c429842f
7 changed files with 147 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/object.c
View File

@ -644,7 +644,7 @@ int paint_ride_entry(int flags, int ebx, int ecx, int edx, rct_drawpixelinfo* dp
no_positions = *((uint16*)peep_loading_positions);
peep_loading_positions += 2;
}
rideVehicleEntry->var_61 = (uint32)peep_loading_positions;
rideVehicleEntry->peep_loading_positions = peep_loading_positions;
peep_loading_positions += no_positions;
}
}
@ -718,7 +718,7 @@ int paint_ride_entry(int flags, int ebx, int ecx, int edx, rct_drawpixelinfo* dp
}
rideVehicleEntry->var_02 = 0;
rideVehicleEntry->var_03 = 0;
rideVehicleEntry->var_61 = 0;
rideVehicleEntry->peep_loading_positions = 0;
}
ride_type->var_1AE = 0;

186
src/peep/peep.c
View File

@ -244,12 +244,12 @@ void peep_check_cant_find_exit(rct_peep* peep){
}
/* rct2: 0x6939EB
* Possibly peep update action frame.
* Also used to move peeps to the correct position to
* start an action. Returns 1 if the correct destination
* has not yet been reached.
* has not yet been reached. xy_distance is how close the
* peep is to the target.
*/
int sub_6939EB(sint16* x, sint16* y, rct_peep* peep){
int peep_update_action(sint16* x, sint16* y, sint16* xy_distance, rct_peep* peep){
RCT2_GLOBAL(0xF1AEF0, uint8) = peep->action_sprite_image_offset;
if (peep->action == 0xFE){
peep->action = 0xFF;
@ -260,9 +260,11 @@ int sub_6939EB(sint16* x, sint16* y, rct_peep* peep){
int x_delta = abs(*x);
int y_delta = abs(*y);
*xy_distance = x_delta + y_delta;
if (peep->action >= 0xFE){
if (x_delta + y_delta <= peep->destination_tolerence){
if (*xy_distance <= peep->destination_tolerence){
return 0;
}
int direction = 0;
@ -604,8 +606,9 @@ void peep_remove(rct_peep* peep){
void peep_update_falling(rct_peep* peep){
if (peep->action == PEEP_ACTION_DROWNING){
// Check to see if we are ready to drown.
sint16 x, y;
sub_6939EB(&x, &y, peep);
sint16 x, y, xy_distance;
peep_update_action(&x, &y, &xy_distance, peep);
//RCT2_CALLPROC_X(0x6939EB, 0, 0, 0, 0, (int)peep, 0, 0);
if (peep->action == PEEP_ACTION_DROWNING) return;
if (!(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & 0x80000)){
@ -762,8 +765,8 @@ void peep_update_sitting(rct_peep* peep){
}
else if (peep->sub_state == 1){
if (peep->action < 0xFE){
sint16 x, y;
sub_6939EB(&x, &y, peep);
sint16 x, y, xy_distance;
peep_update_action(&x, &y, &xy_distance, peep);
//RCT2_CALLPROC_X(0x6939EB, 0, 0, 0, 0, (int)peep, 0, 0);
if (peep->action != 0xFF) return;
@ -943,16 +946,17 @@ static void peep_go_to_ride_entrance(rct_peep* peep, rct_ride* ride){
}
/* rct2: 0x00691A3B */
static void peep_leaving_ride_sub_state_0(rct_peep* peep){
static void peep_update_ride_sub_state_0(rct_peep* peep){
rct_ride* ride = GET_RIDE(peep->current_ride);
if (peep->destination_tolerence != 0){
invalidate_sprite((rct_sprite*)peep);
sint16 y_diff = abs(peep->y - peep->destination_y);
sint16 x, y;
if (sub_6939EB(&x, &y, peep)){
sint16 x, y, xy_distance;
if (peep_update_action(&x, &y, &xy_distance, peep)){
sint16 z = peep->z;
if (y_diff < 16){
if (xy_distance < 16){
z = ride->station_heights[peep->current_ride_station] * 8 + 2;
}
sprite_move(x, y, z, (rct_sprite*)peep);
@ -1099,12 +1103,95 @@ static void peep_leaving_ride_sub_state_0(rct_peep* peep){
peep_go_to_ride_entrance(peep, ride);
}
/* rct2: 0x006921D3 */
void peep_update_ride_sub_state_1(rct_peep* peep){
sint16 x, y, xy_distance;
rct_ride* ride = GET_RIDE(peep->current_ride);
rct_ride_type* ride_entry = gRideTypeList[ride->subtype];
if (peep_update_action(&x, &y, &xy_distance, peep))
{
uint8 vehicle = ride_entry->var_014;
if (ride_entry->vehicles[vehicle].var_12 & (1 << 3) ||
ride_entry->vehicles[vehicle].var_14 & ((1 << 14) | (1<<12)))
RCT2_GLOBAL(0xF1AECA, uint16) = 0x1C;
else
RCT2_GLOBAL(0xF1AECA, uint16) = 0x10;
if (peep->sub_state == 1 &&
xy_distance < RCT2_GLOBAL(0xF1AECA, uint16))
peep->sub_state = 2;
invalidate_sprite((rct_sprite*)peep);
sint16 z = ride->station_heights[peep->current_ride_station] * 8;
RCT2_GLOBAL(0xF1AECA, uint16) += 4;
if (xy_distance < RCT2_GLOBAL(0xF1AECA, uint16)){
z += RCT2_ADDRESS(0x0097D21C, uint8)[ride->type * 8];
}
sprite_move(x, y, z, (rct_sprite*)peep);
invalidate_sprite((rct_sprite*)peep);
return;
}
if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS, uint32)[ride->type * 2] &RIDE_TYPE_FLAG_13)
{
// 0x006924E1
}
rct_vehicle* vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]);
for (int i = peep->current_car; i != 0; --i){
vehicle = GET_VEHICLE(vehicle->next_vehicle_on_train);
}
rct_ride_type_vehicle* vehicle_type = &ride_entry->vehicles[vehicle->vehicle_type];
if (vehicle_type->var_14 & (1 << 10)){
//692378
}
if (vehicle_type->var_14 & (1 << 15)){
peep->destination_x = vehicle->x;
peep->destination_y = vehicle->y;
peep->destination_tolerence = 15;
peep->sub_state = 4;
return;
}
uint8 load_position = vehicle_type->peep_loading_positions[peep->current_seat];
switch (vehicle->sprite_direction / 8){
case 0:
peep->destination_x = vehicle->x - load_position;
break;
case 1:
peep->destination_y = vehicle->y + load_position;
break;
case 2:
peep->destination_x = vehicle->x + load_position;
break;
case 3:
peep->destination_y = vehicle->y - load_position;
break;
}
peep->sub_state = 4;
return;
}
/* rct2: 0x691A30
* Also used by entering_ride and queueing_front */
static void peep_update_leaving_ride(rct_peep* peep){
* Used by entering_ride and queueing_front */
static void peep_update_ride(rct_peep* peep){
switch (peep->sub_state){
case 0:
peep_leaving_ride_sub_state_0(peep);
peep_update_ride_sub_state_0(peep);
break;
case 1:
peep_update_ride_sub_state_1(peep);
break;
default:
RCT2_CALLPROC_X(RCT2_ADDRESS(0x9820DC, int)[peep->sub_state], 0, 0, 0, 0, (int)peep, 0, 0);
@ -1145,7 +1232,7 @@ static void peep_update_queuing(rct_peep* peep){
return;
}
if (peep->sub_state != 0xA){
if (peep->sub_state != 10){
if (peep->next_in_queue == 0xFFFF){
//Happens every time peep goes onto ride.
peep->destination_tolerence = 0;
@ -1168,7 +1255,7 @@ static void peep_update_queuing(rct_peep* peep){
RCT2_CALLPROC_X(0x693C9E, 0, 0, 0, 0, (int)peep, 0, 0);
if (peep->action < 0xFE)return;
if (peep->sprite_type == 0){
if (peep->var_7A >= 2000 && (0xFFFF & scenario_rand()) <= 119){
if (peep->time_in_queue >= 2000 && (0xFFFF & scenario_rand()) <= 119){
// Eat Food/Look at watch
peep->action = PEEP_ACTION_EAT_FOOD;
peep->action_frame = 0;
@ -1176,14 +1263,14 @@ static void peep_update_queuing(rct_peep* peep){
sub_693B58(peep);
invalidate_sprite((rct_sprite*)peep);
}
if (peep->var_7A >= 3500 && (0xFFFF & scenario_rand()) <= 93)
if (peep->time_in_queue >= 3500 && (0xFFFF & scenario_rand()) <= 93)
{
//Create the ive been waiting in line ages thought
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_QUEUING_AGES, peep->current_ride);
}
}
else{
if (!(peep->var_7A & 0x3F) && peep->action == 0xFE && peep->var_6F == 2){
if (!(peep->time_in_queue & 0x3F) && peep->action == 0xFE && peep->var_6F == 2){
switch (peep->sprite_type){
case 0xF:
case 0x10:
@ -1217,7 +1304,7 @@ static void peep_update_queuing(rct_peep* peep){
}
}
}
if (peep->var_7A < 4300) return;
if (peep->time_in_queue < 4300) return;
if (peep->happiness <= 65 && (0xFFFF & scenario_rand()) < 2184){
//Give up queueing for the ride
@ -1237,8 +1324,8 @@ static void peep_update_mowing(rct_peep* peep){
invalidate_sprite((rct_sprite*)peep);
while (1){
sint16 x = 0, y = 0;
if (sub_6939EB(&x, &y, peep)){
sint16 x = 0, y = 0, xy_distance;
if (peep_update_action(&x, &y, &xy_distance, peep)){
int eax = x, ebx, ecx = y, z, ebp, edi;
RCT2_CALLFUNC_X(0x662783, &eax, &ebx, &ecx, &z, (int*)&peep, &edi, &ebp);
@ -1298,8 +1385,8 @@ static void peep_update_watering(rct_peep* peep){
}
else if (peep->sub_state == 1){
if (peep->action != PEEP_ACTION_NONE_2){
sint16 x, y;
sub_6939EB(&x, &y, peep);
sint16 x, y, xy_distance;
peep_update_action(&x, &y, &xy_distance, peep);
return;
}
@ -1355,8 +1442,8 @@ static void peep_update_emptying_bin(rct_peep* peep){
return;
}
sint16 x = 0, y = 0;
sub_6939EB(&x, &y, peep);
sint16 x = 0, y = 0, xy_distance;
peep_update_action(&x, &y, &xy_distance, peep);
if (peep->action_frame != 11)return;
@ -1410,8 +1497,8 @@ static void peep_update_sweeping(rct_peep* peep){
peep->staff_litter_swept++;
peep->var_45 |= (1 << 4);
}
sint16 x = 0, y = 0;
if (sub_6939EB(&x, &y, peep)){
sint16 x = 0, y = 0, xy_distance;
if (peep_update_action(&x, &y, &xy_distance, peep)){
int eax = x, ebx, ecx = y, z, ebp, edi;
RCT2_CALLFUNC_X(0x694921, &eax, &ebx, &ecx, &z, (int*)&peep, &edi, &ebp);
@ -1474,8 +1561,8 @@ static void peep_update_leaving_park(rct_peep* peep){
return;
}
sint16 x = 0, y = 0;
if (sub_6939EB(&x, &y, peep)){
sint16 x = 0, y = 0, xy_distance;
if (peep_update_action(&x, &y, &xy_distance, peep)){
invalidate_sprite((rct_sprite*)peep);
sprite_move(x, y, peep->z, (rct_sprite*)peep);
invalidate_sprite((rct_sprite*)peep);
@ -1522,8 +1609,8 @@ static void peep_update_watching(rct_peep* peep){
else if (peep->sub_state == 1){
if (peep->action < 0xFE){
//6917F6
sint16 x = 0, y = 0;
sub_6939EB(&x, &y, peep);
sint16 x = 0, y = 0, xy_distance;
peep_update_action(&x, &y, &xy_distance, peep);
if (peep->action != 0xFF)return;
peep->action = 0xFE;
@ -1591,8 +1678,8 @@ static void peep_update_entering_park(rct_peep* peep){
}
return;
}
sint16 x = 0, y = 0;
if (sub_6939EB(&x, &y, peep)){
sint16 x = 0, y = 0, xy_distance;
if (peep_update_action(&x, &y, &xy_distance, peep)){
invalidate_sprite((rct_sprite*)peep);
sprite_move(x, y, peep->z, (rct_sprite*)peep);
invalidate_sprite((rct_sprite*)peep);
@ -1838,8 +1925,8 @@ static void peep_update_buying(rct_peep* peep)
if (peep->sub_state == 1){
if (peep->action != 0xFF){
sint16 x, y;
sub_6939EB(&x, &y, peep);
sint16 x, y, xy_distance;
peep_update_action(&x, &y, &xy_distance, peep);
return;
}
@ -1932,8 +2019,8 @@ static void peep_update_using_bin(rct_peep* peep){
else if (peep->sub_state == 1){
if (peep->action != PEEP_ACTION_NONE_2){
sint16 x, y;
sub_6939EB(&x, &y, peep);
sint16 x, y, xy_distance;
peep_update_action(&x, &y, &xy_distance, peep);
return;
}
@ -2137,8 +2224,8 @@ static void peep_update_heading_to_inspect(rct_peep* peep){
sint16 delta_y = abs(peep->y - peep->destination_y);
sint16 x, y;
if (!sub_6939EB(&x, &y, peep)){
sint16 x, y, xy_distance;
if (!peep_update_action(&x, &y, &xy_distance, peep)){
peep_decrement_num_riders(peep);
peep->state = PEEP_STATE_INSPECTING;
peep->sub_state = 0;
@ -2191,8 +2278,8 @@ static void peep_update_answering(rct_peep* peep){
RCT2_CALLPROC_X(0x0069A98C, 0, 0, 0, 0, (int)peep, 0, 0);
return;
}
sint16 x, y;
sub_6939EB(&x, &y, peep);
sint16 x, y, xy_distance;
peep_update_action(&x, &y, &xy_distance, peep);
return;
}
else if (peep->sub_state <= 3){
@ -2249,8 +2336,8 @@ static void peep_update_answering(rct_peep* peep){
sint16 delta_y = abs(peep->y - peep->destination_y);
sint16 x, y;
if (!sub_6939EB(&x, &y, peep)){
sint16 x, y, xy_distance;
if (!peep_update_action(&x, &y, &xy_distance, peep)){
peep_decrement_num_riders(peep);
peep->state = PEEP_STATE_FIXING;
peep->sub_state = 0;
@ -2813,13 +2900,13 @@ static void peep_update(rct_peep *peep)
peep_update_1(peep);
break;
case PEEP_STATE_QUEUING_FRONT:
peep_update_leaving_ride(peep);
peep_update_ride(peep);
break;
case PEEP_STATE_ON_RIDE:
// No action
break;
case PEEP_STATE_LEAVING_RIDE:
peep_update_leaving_ride(peep);
peep_update_ride(peep);
break;
case PEEP_STATE_WALKING:
peep_update_walking(peep);
@ -2828,8 +2915,7 @@ static void peep_update(rct_peep *peep)
peep_update_queuing(peep);
break;
case PEEP_STATE_ENTERING_RIDE:
// Calls the same function as leaving ride
peep_update_leaving_ride(peep);
peep_update_ride(peep);
break;
case PEEP_STATE_SITTING:
peep_update_sitting(peep);

2
src/peep/peep.h
View File

@ -436,7 +436,7 @@ typedef struct {
uint8 pad_77;
uint8 var_78;
uint8 var_79;
uint16 var_7A; // time waiting in line possibly
uint16 time_in_queue; // 0x7A
uint8 rides_been_on[32]; // 0x7C
// 255 bit bitmap of every ride the peep has been on see
// window_peep_rides_update for how to use.

6
src/ride/ride.h
View File

@ -82,12 +82,14 @@ typedef struct{
uint32 var_4C; // 0x4C , 0x66
uint32 no_vehicle_images; // 0x50 , 0x6A
uint8 no_seating_rows; // 0x54 , 0x6E
uint8 pad_55[0x7];
uint8 pad_55[0x5];
uint8 var_5A; // 0x5A , 0x74
uint8 pad_5B; // 0x5B , 0x75
uint8 var_5C; // 0x5C , 0x76
uint8 var_5D; // 0x5D , 0x77
uint8 pad_5E[0x2];
uint8 var_60; // 0x60 , 0x7A
uint32 var_61; // 0x61 , 0x7B
uint8* peep_loading_positions; // 0x61 , 0x7B
} rct_ride_type_vehicle;
/**

2
src/ride/station.c
View File

@ -236,7 +236,7 @@ static void ride_race_init_vehicle_speeds(rct_ride *ride)
rideEntry = GET_RIDE_ENTRY(vehicle->var_D6);
vehicle->speed = (scenario_rand() & 16) - 8 + rideEntry->vehicles[vehicle->var_31].var_5C;
vehicle->speed = (scenario_rand() & 16) - 8 + rideEntry->vehicles[vehicle->vehicle_type].var_5C;
if (vehicle->num_peeps != 0) {
rct_peep *peep = &g_sprite_list[vehicle->peep[0]].peep;

5
src/ride/vehicle.c
View File

@ -99,9 +99,8 @@ void vehicle_update_sound_params(rct_vehicle* vehicle)
sint32 v19 = vehicle->velocity;
int testaddr = (vehicle->var_31 * 0x65);
testaddr += (int)RCT2_ADDRESS(0x009ACFA4, rct_ride_type*)[vehicle->var_D6];
uint8 test = ((uint8*)testaddr)[0x74];
rct_ride_type* ride_type = GET_RIDE_ENTRY(vehicle->var_D6);
uint8 test = ride_type->vehicles[vehicle->vehicle_type].var_5A;
if (test & 1) {
v19 *= 2;

2
src/ride/vehicle.h
View File

@ -51,7 +51,7 @@ typedef struct {
sint32 velocity; // 0x28
uint8 pad_2C[0x04];
uint8 ride; // 0x30
uint8 var_31;
uint8 vehicle_type; // 0x31
uint8 pad_32[0x02];
uint16 var_34;
sint16 var_36;