1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00

Fix some warnings

This commit is contained in:
Gymnasiast
2015-07-13 11:56:58 +02:00
parent a63642b630
commit 0cbabb479e
4 changed files with 7 additions and 7 deletions

View File

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

View File

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

View File

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

View File

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