mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1028 from duncanspumpkin/bugs 

Bug Fixes
This commit is contained in:
Ted John 2015-04-29 01:49:02 +01:00
parent 54cf1c4371 1728aebb8c
commit d50a297981
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/windows/top_toolbar.c
View File

@ -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;

2
src/world/climate.c
View File

@ -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;