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

Let code make more sense

Browse Source
This commit is contained in:
Marijn van der Werf
2016-02-12 19:24:21 +01:00
parent 7565a7ba69
commit 44cd07f9c6
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/peep/peep.c
View File

@@ -3752,7 +3752,7 @@ static bool peep_update_fixing_sub_state_9(bool firstRun, rct_peep *peep, rct_ri
sint16 x, y, tmp_xy_distance;
if (!firstRun) {
if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_15)) {
if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_15)) {
return true;
}
@@ -3766,16 +3766,21 @@ static bool peep_update_fixing_sub_state_9(bool firstRun, rct_peep *peep, rct_ri
rct_xy_element input;
input.x = (stationPosition & 0xFF) * 32;
input.y = (stationPosition >> 8) * 32;
char buffer[256];
format_string(buffer, ride->name, &ride->name_arguments);
log_info("%s", buffer);
input.element = map_get_track_element_at_from_ride(input.x, input.y, stationZ, peep->current_ride);
track_begin_end *trackBeginEnd;
while (track_block_get_previous(input.x, input.y, input.element, trackBeginEnd)) {
uint8 trackType = trackBeginEnd->begin_element->properties.track.type;
track_begin_end trackBeginEnd;
while (track_block_get_previous(input.x, input.y, input.element, &trackBeginEnd)) {
uint8 trackType = trackBeginEnd.begin_element->properties.track.type;
if (trackType == 2 || trackType == 3 || trackType == 1) {
input.x = trackBeginEnd->begin_x;
input.y = trackBeginEnd->begin_y;
input.x = trackBeginEnd.begin_x;
input.y = trackBeginEnd.begin_y;
input.element = trackBeginEnd.begin_element;
RCT2_GLOBAL(0xF43914, uint32) = trackBeginEnd->begin_element->type & 3;
RCT2_GLOBAL(0xF43914, uint32) = trackBeginEnd.begin_element->type & 3;
continue;
}