mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Merge pull request #3406 from janisozaur/warnings

Browse Source 
Fix warnings in clang, gcc
This commit is contained in:
Ted John
2016-04-23 14:08:27 +01:00
parent ee509caf35 d23cbe5722
commit 6453bcbc46
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/windows/editor_scenario_options.c
View File

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

2
src/windows/multiplayer.c
View File

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

2
src/windows/player.c
View File

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

2
src/world/climate.c
View File

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