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

Fix some warnings

This commit is contained in:
Gymnasiast 2015-07-03 12:06:53 +02:00
parent 0d71dc7f00
commit a63642b630
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/rct2.c
View File

@ -21,6 +21,7 @@
#pragma warning(disable : 4996) // GetVersionExA deprecated
#include <setjmp.h>
#include <time.h>
#include "addresses.h"
#include "audio/audio.h"
#include "audio/mixer.h"

2
src/scenario.c
View File

@ -828,7 +828,7 @@ static void sub_674BCF()
/**
* Modifys the given S6 data so that ghost elements, rides with no track elements or unused banners / user strings are saved.
*/
static scenario_fix_ghosts(rct_s6_data *s6)
static void scenario_fix_ghosts(rct_s6_data *s6)
{
// Remove all ghost elements
size_t mapElementTotalSize = MAX_MAP_ELEMENTS * sizeof(rct_map_element);

10
src/windows/options.c
View File

@ -675,13 +675,13 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
num_items = gConfigThemes.num_presets;
gDropdownItemsFormat[0] = 2777;
gDropdownItemsArgs[0] = (uint64)&gConfigThemes.presets[1].name;
gDropdownItemsArgs[0] = (uint32)&gConfigThemes.presets[1].name;
gDropdownItemsFormat[1] = 2777;
gDropdownItemsArgs[1] = (uint64)&gConfigThemes.presets[0].name;
gDropdownItemsArgs[1] = (uint32)&gConfigThemes.presets[0].name;
for (i = 2; i < num_items; i++) {
gDropdownItemsFormat[i] = 2777;
gDropdownItemsArgs[i] = (uint64)&gConfigThemes.presets[i].name;
gDropdownItemsArgs[i] = (uint32)&gConfigThemes.presets[i].name;
}
window_dropdown_show_text_custom_width(
@ -749,7 +749,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
case WIDX_LANGUAGE_DROPDOWN:
for (i = 1; i < LANGUAGE_COUNT; i++) {
gDropdownItemsFormat[i - 1] = 2777;
gDropdownItemsArgs[i - 1] = (sint64)language_names[i];
gDropdownItemsArgs[i - 1] = (sint32)language_names[i];
}
window_options_show_dropdown(w, widget, LANGUAGE_COUNT - 1);
gDropdownItemsChecked = 1 << (gCurrentLanguage - 1);
@ -827,7 +827,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
for (i = 0; i < num_items; i++) {
gDropdownItemsFormat[i] = 2777;
gDropdownItemsArgs[i] = (uint64)&gConfigTitleSequences.presets[i].name;
gDropdownItemsArgs[i] = (uint32)&gConfigTitleSequences.presets[i].name;
}
window_dropdown_show_text_custom_width(