From f7b8d4567bbf58033be7b891e4395bc91005bfa8 Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Fri, 23 May 2014 11:14:34 +0100 Subject: [PATCH 1/2] Fixed #122. Changed config to use better sounding settings. --- src/config.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/config.c b/src/config.c index 0d7eb2a073..aa164ce818 100644 --- a/src/config.c +++ b/src/config.c @@ -282,8 +282,8 @@ static void config_create_default(char *path) fprintf(fp, "play_intro = false\n"); fprintf(fp, "edge_scrolling = true\n"); fprintf(fp, "currency = GBP\n"); - fprintf(fp, "use_imperial = false\n"); - fprintf(fp, "use_farenheit = false\n"); + fprintf(fp, "measurement_format = imperial\n"); + fprintf(fp, "temperature_format = fahrenheit\n"); fprintf(fp, "[sound]\n"); fprintf(fp, "sound_quality = high\n"); fprintf(fp, "forced_software_buffering = false\n"); @@ -359,7 +359,7 @@ static void config_general(char *setting, char *value){ strcpy(gGeneral_config.game_path, value); } else if (strcmp(setting, "screenshot_format") == 0) { - if (strcmp(value, "png") == 0 || strcmp(value, "PNG") == 0) { + if (strcmp(value, "png") == 0) { gGeneral_config.screenshot_format = SCREENSHOT_FORMAT_PNG; } else if (strcmp(value, "1") == 0) { //TODO: REMOVE LINE AT LATER DATE WHEN EVERYONE HAS NEW CONFIG FORMAT @@ -380,16 +380,16 @@ static void config_general(char *setting, char *value){ gGeneral_config.edge_scrolling = 0; } } - else if (strcmp(setting, "use_imperial") == 0){ - if (strcmp(value, "true") == 0){ + else if (strcmp(setting, "measurement_format") == 0){ + if (strcmp(value, "imperial") == 0){ gGeneral_config.measurement_format = MEASUREMENT_FORMAT_IMPERIAL; } else{ gGeneral_config.measurement_format = MEASUREMENT_FORMAT_METRIC; } } - else if (strcmp(setting, "use_farenheit") == 0){ - if (strcmp(value, "true") == 0){ + else if (strcmp(setting, "temperature_format") == 0){ + if (strcmp(value, "fahrenheit") == 0){ gGeneral_config.temperature_format = TEMPERATURE_FORMAT_F; } else{ @@ -528,7 +528,7 @@ static int config_parse_value(FILE *fp, char *value) fseek(fp, start, SEEK_SET); c = fgetc(fp); while (c != EOF && c != '\n') { - value[pos] = (char)c; + value[pos] = (char)tolower(c); c = fgetc(fp); pos++; } From dc3804bfa2b1dc1baf661f62f10d4a2b1ddb1e4e Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Fri, 23 May 2014 11:28:35 +0100 Subject: [PATCH 2/2] Fixes one of the issues of #121 but 526 cannot be easily fixed --- projects/openrct2.vcxproj | 2 +- src/game.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj index b1c490f757..9e85fc8eb7 100644 --- a/projects/openrct2.vcxproj +++ b/projects/openrct2.vcxproj @@ -193,4 +193,4 @@ - + \ No newline at end of file diff --git a/src/game.c b/src/game.c index 945d1f7dc9..55cb5728d5 100644 --- a/src/game.c +++ b/src/game.c @@ -629,7 +629,6 @@ static void input_leftmousedown(int x, int y, rct_window *w, int widgetIndex) if (w != NULL) { windowClass = w->classification; windowNumber = w->number; - widget = &w->widgets[widgetIndex]; } window_close_by_id(WC_ERROR, 0); @@ -643,6 +642,8 @@ static void input_leftmousedown(int x, int y, rct_window *w, int widgetIndex) if (widgetIndex == -1) return; + widget = &w->widgets[widgetIndex]; + switch (widget->type) { case WWT_FRAME: case WWT_RESIZE: