From 290255a32d2e45afe7c90c41f12db1f8c2fbb3a7 Mon Sep 17 00:00:00 2001 From: ZedThree Date: Mon, 5 May 2014 20:55:25 +0200 Subject: [PATCH] Fix bug: rides not sorted correctly --- src/window_ride_list.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/window_ride_list.c b/src/window_ride_list.c index 92d08a7918..390261673b 100644 --- a/src/window_ride_list.c +++ b/src/window_ride_list.c @@ -497,14 +497,14 @@ static void window_ride_list_scrollpaint() formatSecondary = STR_POPULARITY_UNKNOWN_LABEL; if ((ride->var_158 & 0xFF) != 255) { formatSecondary = STR_POPULARITY_LABEL; - RCT2_GLOBAL(0x013CE952 + 2, uint16) = (ride->var_158 * 4) & 0xFF; - } + RCT2_GLOBAL(0x013CE952 + 2, uint16) = (ride->var_158 & 0xFF) * 4; + } break; case INFORMATION_TYPE_SATISFACTION: formatSecondary = STR_SATISFACTION_UNKNOWN_LABEL; if ((ride->var_14A & 0xFF) != 255) { formatSecondary = STR_SATISFACTION_LABEL; - RCT2_GLOBAL(0x013CE952 + 2, uint16) = (ride->var_14A * 5) & 0xFF; + RCT2_GLOBAL(0x013CE952 + 2, uint16) = (ride->var_14A & 0xFF) * 5; } break; case INFORMATION_TYPE_PROFIT: @@ -647,7 +647,7 @@ static void window_ride_list_refresh_list(rct_window *w) case INFORMATION_TYPE_POPULARITY: while (--k >= 0) { otherRide = &(RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST, rct_ride)[w->var_076[k]]); - if ((ride->var_158 * 4) & 0xFF <= (otherRide->var_158 * 4) & 0xFF) + if ((ride->var_158 & 0xFF) * 4 <= (otherRide->var_158 & 0xFF) * 4) break; swapper = w->var_076[k]; @@ -658,7 +658,7 @@ static void window_ride_list_refresh_list(rct_window *w) case INFORMATION_TYPE_SATISFACTION: while (--k >= 0) { otherRide = &(RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST, rct_ride)[w->var_076[k]]); - if ((ride->var_14A * 5) & 0xFF <= (otherRide->var_14A * 5) & 0xFF) + if ((ride->var_14A & 0xFF) * 5 <= (otherRide->var_14A & 0xFF) * 5) break; swapper = w->var_076[k];