From 0816a5fdf513d85488803350239290a70549ab9a Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Tue, 28 Apr 2015 17:07:36 +0100 Subject: [PATCH 1/2] Fix footpath bit placement failing. Fixes #1025 --- src/windows/top_toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows/top_toolbar.c b/src/windows/top_toolbar.c index b6c111e634..58fb52b411 100644 --- a/src/windows/top_toolbar.c +++ b/src/windows/top_toolbar.c @@ -1038,7 +1038,7 @@ void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid_x, sin return; } - *parameter_1 = 0 | map_element->properties.path.type & 0x7; + *parameter_1 = 0 | ((map_element->properties.path.type & 0x7) << 8); *parameter_2 = map_element->base_height | ((map_element->properties.path.type >> 4) << 8); if (map_element->type & 1){ *parameter_2 |= 0x8000; From 1728aebb8c761cb509f4cdd5d4f3f560565b3e35 Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Tue, 28 Apr 2015 17:11:46 +0100 Subject: [PATCH 2/2] Fix #958. Issue was caused by an old bit of code that had been added in the force weather cheat to keep it sunny for longer before realising how the climate operated correctly. Instead now it sets the weather to the desired value and starts a normal amount of waiting time before returning to the normal weather cycle. --- src/world/climate.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/world/climate.c b/src/world/climate.c index e50af29358..d687c1e5ff 100644 --- a/src/world/climate.c +++ b/src/world/climate.c @@ -191,8 +191,6 @@ void climate_update() } void climate_force_weather(uint8 weather){ - gClimateNextWeather = 0; - RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_WEATHER, sint8) = weather; RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_WEATHER_GLOOM, sint8) = climate_weather_data[weather].gloom_level; RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_RAIN_LEVEL, sint8) = climate_weather_data[weather].rain_level;