From c69dec0802dcdcc29f3db3c541ff6b6b20be12c7 Mon Sep 17 00:00:00 2001 From: Duncan Date: Fri, 27 Jun 2014 15:33:31 +0100 Subject: [PATCH] Fixed logic mistake in thoughts Has not been tested. --- src/window_guest_list.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/window_guest_list.c b/src/window_guest_list.c index d3d88730da..932bd16d51 100644 --- a/src/window_guest_list.c +++ b/src/window_guest_list.c @@ -827,11 +827,11 @@ static int window_guest_list_is_peep_in_filter(rct_peep* peep) void get_arguments_from_thought(rct_peep_thought thought, uint32* argument_1, uint32* argument_2){ int esi = 0x9AC86C; - if ((RCT2_ADDRESS(0x981DB1, uint16)[thought.type] & 0xFF) == 1){ + if ((RCT2_ADDRESS(0x981DB1, uint16)[thought.type] & 0xFF) & 1){ rct_ride* ride = &(RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST,rct_ride)[thought.item]); esi = &(ride->var_04A); } - else if ((RCT2_ADDRESS(0x981DB1, uint16)[thought.type] & 0xFF) == 2){ + else if ((RCT2_ADDRESS(0x981DB1, uint16)[thought.type] & 0xFF) & 2){ if (thought.item < 0x20){ RCT2_GLOBAL(0x9AC86C, uint16) = thought.item + 0x7C4; } @@ -839,7 +839,7 @@ void get_arguments_from_thought(rct_peep_thought thought, uint32* argument_1, ui RCT2_GLOBAL(0x9AC86C, uint16) = thought.item + 0x82A; } } - else if ((RCT2_ADDRESS(0x981DB1, uint16)[thought.type] & 0xFF) == 4){ + else if ((RCT2_ADDRESS(0x981DB1, uint16)[thought.type] & 0xFF) & 4){ if (thought.item < 0x20){ RCT2_GLOBAL(0x9AC86C, uint16) = thought.item + 0x7FC; }