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

celsius fix

This commit is contained in:
ddevrien 2014-05-12 16:51:40 +02:00
parent 85a1e4aa6d
commit c6fc8c634b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/climate.c
View File

@ -41,9 +41,9 @@ static const rct_weather_transition* climate_transitions[4];
static void climate_determine_future_weather();
int climate_celcius_to_fahrenheit(int celcius)
int climate_celsius_to_fahrenheit(int celsius)
{
return (celcius * 29) / 16 + 32;
return (celsius * 29) / 16 + 32;
}
/**

2
src/climate.h
View File

@ -41,7 +41,7 @@ typedef struct {
extern int gClimateNextWeather;
extern const rct_weather climate_weather_data[6];
int climate_celcius_to_fahrenheit(int celcius);
int climate_celsius_to_fahrenheit(int celsius);
void climate_reset(int climate);
void climate_update();

2
src/config.c
View File

@ -103,7 +103,7 @@ void config_load()
return;
RCT2_GLOBAL(0x009AB4C6, sint8) = 1;
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) = 0;
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FAHRENHEIT, sint8) = 1;
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_TEMPERATURE, sint8) = 1;
RCT2_GLOBAL(0x009AACBB, sint8) = 1;
RCT2_GLOBAL(0x009AACBD, sint16) = 0;
if (!(RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) & CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS))