From 718347eddcf308016c552042ed3a19688ec53e76 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 14 Aug 2016 12:09:02 +0200 Subject: [PATCH] Integrate data at 0x00981FF1 --- src/peep/peep.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/peep/peep.c b/src/peep/peep.c index ab8e0072ca..d2b6e7c942 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -3564,6 +3564,14 @@ static void peep_update_ride_sub_state_16(rct_peep* peep){ peep->destination_y = y; } +/** rct2: 0x00981FF1 */ +static const uint8 _981FF1[][4] = { + { 1, 2, 14, 0 }, + { 4, 5, 6, 2 }, + { 6, 8, 9, 10 }, + { 14, 10, 12, 13 }, +}; + /** * * rct2: 0x00692A83 @@ -3611,20 +3619,21 @@ static void peep_update_ride_sub_state_17(rct_peep* peep){ uint16 maze_entry = mapElement->properties.track.maze_entry; uint16 open_hedges = 0; uint8 var_37 = peep->var_37; + // var_37 is 3, 7, 11 or 15 - if (maze_entry & (1 << RCT2_ADDRESS(0x981FF4, uint8)[var_37])){ + if (maze_entry & (1 << _981FF1[var_37 / 4][3])) { open_hedges = 1; } open_hedges <<= 1; - if (maze_entry & (1 << RCT2_ADDRESS(0x981FF3, uint8)[var_37])){ + if (maze_entry & (1 << _981FF1[var_37 / 4][2])) { open_hedges |= 1; } open_hedges <<= 1; - if (maze_entry & (1 << RCT2_ADDRESS(0x981FF2, uint8)[var_37])){ + if (maze_entry & (1 << _981FF1[var_37 / 4][1])) { open_hedges |= 1; } open_hedges <<= 1; - if (maze_entry & (1 << RCT2_ADDRESS(0x981FF1, uint8)[var_37])){ + if (maze_entry & (1 << _981FF1[var_37 / 4][0])) { open_hedges |= 1; }