From 69d87942601d4c6d824ef85af0d02eb169aa7340 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Tue, 16 May 2017 20:12:18 +0100 Subject: [PATCH] Use snake case for peep fields --- src/openrct2/peep/peep.c | 26 +++++++++++++------------- src/openrct2/peep/peep.h | 2 +- src/openrct2/rct1.h | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/openrct2/peep/peep.c b/src/openrct2/peep/peep.c index 0d828c6273..a1f5eebf24 100644 --- a/src/openrct2/peep/peep.c +++ b/src/openrct2/peep/peep.c @@ -3980,7 +3980,7 @@ static void peep_update_ride_sub_state_18(rct_peep* peep){ } } - peep->interactionRideIndex = 0xFF; + peep->interaction_ride_index = 0xFF; peep_decrement_num_riders(peep); peep->state = PEEP_STATE_FALLING; peep_window_state_update(peep); @@ -7130,7 +7130,7 @@ rct_peep *peep_generate(sint32 x, sint32 y, sint32 z) peep->var_41 = (scenario_rand() & 0x1F) + 45; peep->var_C4 = 0; - peep->interactionRideIndex = 0xFF; + peep->interaction_ride_index = 0xFF; peep->type = PEEP_TYPE_GUEST; peep->previous_ride = 0xFF; peep->thoughts->type = PEEP_THOUGHT_TYPE_NONE; @@ -7948,7 +7948,7 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc if (entranceType == ENTRANCE_TYPE_RIDE_EXIT){ // Default guest/staff behaviour attempting to enter a // ride exit is to turn around. - peep->interactionRideIndex = 0xFF; + peep->interaction_ride_index = 0xFF; return peep_return_to_center_of_tile(peep); } @@ -7956,7 +7956,7 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc if (peep->type == PEEP_TYPE_STAFF){ // Default staff behaviour attempting to enter a // ride entrance is to turn around. - peep->interactionRideIndex = 0xFF; + peep->interaction_ride_index = 0xFF; return peep_return_to_center_of_tile(peep); } @@ -7968,7 +7968,7 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc } // Guest is on a normal path, i.e. ride has no queue. - if (peep->interactionRideIndex == rideIndex) + if (peep->interaction_ride_index == rideIndex) // Peep is retrying the ride entrance without leaving // the path tile and without trying any other ride // attached to this path tile. i.e. stick with the @@ -7983,13 +7983,13 @@ static sint32 peep_interact_with_entrance(rct_peep* peep, sint16 x, sint16 y, rc if (!peep_should_go_on_ride(peep, rideIndex, stationNum, 0)){ // Peep remembers that this is the last ride they // considered while on this path tile. - peep->interactionRideIndex = rideIndex; + peep->interaction_ride_index = rideIndex; return peep_return_to_center_of_tile(peep); } // Guest has decided to go on the ride. peep->action_sprite_image_offset = _unk_F1AEF0; - peep->interactionRideIndex = rideIndex; + peep->interaction_ride_index = rideIndex; rct_ride* ride = get_ride(rideIndex); uint16 previous_last = ride->last_peep_in_queue[stationNum]; @@ -8344,7 +8344,7 @@ static sint32 peep_interact_with_path(rct_peep* peep, sint16 x, sint16 y, rct_ma // Check if this queue path tile is connected to a ride. if (rideIndex == 0xFF){ // Queue is not connected to a ride. - peep->interactionRideIndex = 0xFF; + peep->interaction_ride_index = 0xFF; return peep_footpath_move_forward(peep, x, y, map_element, vandalism_present); } @@ -8370,7 +8370,7 @@ static sint32 peep_interact_with_path(rct_peep* peep, sint16 x, sint16 y, rct_ma // 2. Peep is walking up to the queue entrance from // a normal path tile. - if (peep->interactionRideIndex == rideIndex){ + if (peep->interaction_ride_index == rideIndex){ // Case 1 above applies, so walk the queue. return peep_footpath_move_forward(peep, x, y, map_element, vandalism_present); } @@ -8387,7 +8387,7 @@ static sint32 peep_interact_with_path(rct_peep* peep, sint16 x, sint16 y, rct_ma // Set the following so the peep will correctly walk up // and back down the queue if the ride is closed // while they are queuing. - peep->interactionRideIndex = rideIndex; + peep->interaction_ride_index = rideIndex; rct_ride* ride = get_ride(rideIndex); // Add the peep to the ride queue. @@ -8419,7 +8419,7 @@ static sint32 peep_interact_with_path(rct_peep* peep, sint16 x, sint16 y, rct_ma return peep_footpath_move_forward(peep, x, y, map_element, vandalism_present); } else{ - peep->interactionRideIndex = 0xFF; + peep->interaction_ride_index = 0xFF; if (peep->state == PEEP_STATE_QUEUING){ remove_peep_from_queue(peep); peep_decrement_num_riders(peep); @@ -8449,7 +8449,7 @@ static sint32 peep_interact_with_shop(rct_peep* peep, sint16 x, sint16 y, rct_ma if (ride->status != RIDE_STATUS_OPEN) return peep_return_to_center_of_tile(peep); - if (peep->interactionRideIndex == rideIndex) + if (peep->interaction_ride_index == rideIndex) return peep_return_to_center_of_tile(peep); if (peep->peep_flags & PEEP_FLAGS_LEAVING_PARK) @@ -10500,7 +10500,7 @@ static sint32 sub_693C9E(rct_peep *peep) sint16 z = abs(map_element_height(x, y) - peep->z); if (z <= 3 || (peep->type == PEEP_TYPE_STAFF && z <= 32)){ - peep->interactionRideIndex = 0xFF; + peep->interaction_ride_index = 0xFF; if (peep->state == PEEP_STATE_QUEUING){ remove_peep_from_queue(peep); peep_decrement_num_riders(peep); diff --git a/src/openrct2/peep/peep.h b/src/openrct2/peep/peep.h index d094872fce..44eb172549 100644 --- a/src/openrct2/peep/peep.h +++ b/src/openrct2/peep/peep.h @@ -555,7 +555,7 @@ typedef struct rct_peep { uint8 maze_last_edge; // 0x78 uint8 direction; //Direction ? }; - uint8 interactionRideIndex; + uint8 interaction_ride_index; uint16 time_in_queue; // 0x7A uint8 rides_been_on[32]; // 0x7C // 255 bit bitmap of every ride the peep has been on see diff --git a/src/openrct2/rct1.h b/src/openrct2/rct1.h index 5b565dee68..20e5826d77 100644 --- a/src/openrct2/rct1.h +++ b/src/openrct2/rct1.h @@ -449,7 +449,7 @@ typedef struct rct1_peep { uint8 maze_last_edge; // 0x78 uint8 direction; //Direction ? }; - uint8 interactionRideIndex; + uint8 interaction_ride_index; uint16 time_in_queue; // 0x7A uint8 rides_been_on[32]; // 0x7C // 255 bit bitmap of every ride the peep has been on see diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 569acbd75d..c96c3d0b63 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1355,7 +1355,7 @@ private: dst->time_on_ride = src->time_on_ride; dst->days_in_queue = src->days_in_queue; - dst->interactionRideIndex = src->interactionRideIndex; + dst->interaction_ride_index = src->interaction_ride_index; dst->id = src->id; dst->cash_in_pocket = src->cash_in_pocket;