From 4f72b82ea00f4dcd2c1fd6e26aa84824b64879f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 23 Apr 2016 13:22:44 +0200 Subject: [PATCH 1/2] Fix warnings in clang, gcc --- src/windows/editor_scenario_options.c | 2 +- src/windows/multiplayer.c | 2 +- src/windows/player.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/windows/editor_scenario_options.c b/src/windows/editor_scenario_options.c index 62345408e7..74ca9019b9 100644 --- a/src/windows/editor_scenario_options.c +++ b/src/windows/editor_scenario_options.c @@ -685,7 +685,7 @@ static void window_editor_scenario_options_financial_paint(rct_window *w, rct_dr x = w->x + w->widgets[WIDX_INTEREST_RATE].left + 1; y = w->y + w->widgets[WIDX_INTEREST_RATE].top; - money16 interestRate = (money16)clamp(INT16_MIN, gBankLoanInterestRate, INT16_MAX); + sint16 interestRate = clamp(INT16_MIN, (sint16)gBankLoanInterestRate, INT16_MAX); gfx_draw_string_left(dpi, 3247, &interestRate, 0, x, y); } } diff --git a/src/windows/multiplayer.c b/src/windows/multiplayer.c index 5790551fd9..c0bf968a9f 100644 --- a/src/windows/multiplayer.c +++ b/src/windows/multiplayer.c @@ -264,7 +264,7 @@ static void window_multiplayer_groups_show_group_dropdown(rct_window *w, rct_wid for (i = 0; i < network_get_num_groups(); i++) { gDropdownItemsFormat[i] = 2777; - gDropdownItemsArgs[i] = (sint64)network_get_group_name(i); + gDropdownItemsArgs[i] = (int)network_get_group_name(i); } if (widget == &window_multiplayer_groups_widgets[WIDX_DEFAULT_GROUP_DROPDOWN]) { dropdown_set_checked(network_get_group_index(network_get_default_group()), true); diff --git a/src/windows/player.c b/src/windows/player.c index ac19cc0a79..59a2455ce5 100644 --- a/src/windows/player.c +++ b/src/windows/player.c @@ -263,7 +263,7 @@ void window_player_overview_show_group_dropdown(rct_window *w, rct_widget *widge for (i = 0; i < network_get_num_groups(); i++) { gDropdownItemsFormat[i] = 2777; - gDropdownItemsArgs[i] = (sint64)network_get_group_name(i); + gDropdownItemsArgs[i] = (int)network_get_group_name(i); } dropdown_set_checked(network_get_group_index(network_get_player_group(player)), true); From d23cbe5722c2bf7d6a406ad08e0209b9939bdaab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 23 Apr 2016 13:38:06 +0200 Subject: [PATCH 2/2] Fix invalid left-shift Suffers from the same problems as #3381 --- src/world/climate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/world/climate.c b/src/world/climate.c index 8d1101eb66..dce30c2fab 100644 --- a/src/world/climate.c +++ b/src/world/climate.c @@ -306,7 +306,7 @@ static void climate_update_thunder() if (_thunderStatus[0] == THUNDER_STATUS_NULL && _thunderStatus[1] == THUNDER_STATUS_NULL) { // Play thunder on left side _thunderSoundId = (randomNumber & 0x20000) ? SOUND_THUNDER_1 : SOUND_THUNDER_2; - _thunderVolume = (-((int)((randomNumber >> 18) & 0xFF))) << 3; + _thunderVolume = (-((int)((randomNumber >> 18) & 0xFF))) * 8; climate_play_thunder(0, _thunderSoundId, _thunderVolume, -10000); // Let thunder play on right side