From 0cbabb479eaf00842be30a27522163a47e130f38 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 13 Jul 2015 11:56:58 +0200 Subject: [PATCH] Fix some warnings --- src/interface/viewport.c | 2 +- src/windows/themes.c | 6 +++--- src/windows/title_command_editor.c | 2 +- src/windows/title_editor.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/interface/viewport.c b/src/interface/viewport.c index 0a4878b9a4..6c40f26334 100644 --- a/src/interface/viewport.c +++ b/src/interface/viewport.c @@ -1118,7 +1118,7 @@ int scrolling_text_setup(rct_string_id string_id, uint16 scroll, uint16 scrollin * dx : height * edi : unknown */ -int sub_6629BC(int height, uint16 ax, uint32 image_id, uint32 edi){ +int sub_6629BC(int height, uint16 ax, uint32 image_id, int edi){ int eax = ax, ebx = 0, ecx = 0, edx = height, esi = 0, _edi = edi, ebp = image_id; RCT2_CALLFUNC_X(0x006629BC, &eax, &ebx, &ecx, &edx, &esi, &_edi, &ebp); diff --git a/src/windows/themes.c b/src/windows/themes.c index ae3d3ea222..9984df3f22 100644 --- a/src/windows/themes.c +++ b/src/windows/themes.c @@ -533,13 +533,13 @@ static void window_themes_mousedown(int widgetIndex, rct_window* w, rct_widget* widget--; 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( diff --git a/src/windows/title_command_editor.c b/src/windows/title_command_editor.c index d1b282a291..7350a129f9 100644 --- a/src/windows/title_command_editor.c +++ b/src/windows/title_command_editor.c @@ -347,7 +347,7 @@ static void window_title_command_editor_mousedown(int widgetIndex, rct_window* w num_items = gConfigTitleSequences.presets[gCurrentTitleSequence].num_saves; for (i = 0; i < num_items; i++) { gDropdownItemsFormat[i] = 2777; - gDropdownItemsArgs[i] = (uint64)&gConfigTitleSequences.presets[gCurrentTitleSequence].saves[i]; + gDropdownItemsArgs[i] = (uint32)&gConfigTitleSequences.presets[gCurrentTitleSequence].saves[i]; } window_dropdown_show_text_custom_width( diff --git a/src/windows/title_editor.c b/src/windows/title_editor.c index 1b3c22c50d..feb68f79e0 100644 --- a/src/windows/title_editor.c +++ b/src/windows/title_editor.c @@ -574,7 +574,7 @@ static void window_title_editor_mousedown(int widgetIndex, rct_window* w, rct_wi 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( @@ -997,4 +997,4 @@ void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int gfx_draw_string_left(dpi, 1170, (void*)RCT2_ADDRESS_COMMON_FORMAT_ARGS, w->colours[1], x + 5, y); } } -} \ No newline at end of file +}