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

Fix #4722: warnings with clang 3.9

This commit is contained in:
Michał Janiszewski 2016-10-30 21:56:30 +01:00
parent 66cd816922
commit 5585a3e67d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interface/console.c
View File

@ -316,14 +316,14 @@ void console_writeline(const utf8 *src)
void console_writeline_error(const utf8 *src)
{
safe_strcpy(_consoleErrorBuffer + 1, src, CONSOLE_BUFFER_2_SIZE - 1);
_consoleErrorBuffer[0] = FORMAT_RED;
_consoleErrorBuffer[0] = (utf8)FORMAT_RED;
console_writeline(_consoleErrorBuffer);
}
void console_writeline_warning(const utf8 *src)
{
safe_strcpy(_consoleErrorBuffer + 1, src, CONSOLE_BUFFER_2_SIZE - 1);
_consoleErrorBuffer[0] = FORMAT_YELLOW;
_consoleErrorBuffer[0] = (utf8)FORMAT_YELLOW;
console_writeline(_consoleErrorBuffer);
}

2
src/paint/map_element/surface.c
View File

@ -1113,7 +1113,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
}
sub_98196C(image_id, 0, 0, 32, 32, 255, height, rotation);
sub_98196C(image_id, 0, 0, 32, 32, -1, height, rotation);
has_surface = true;
}

4
src/windows/title_editor.c
View File

@ -907,7 +907,7 @@ void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int
}
else {
format_string(buffer + 1, 255, STR_STRING, gCommonFormatArgs);
buffer[0] = FORMAT_BLACK;
buffer[0] = (utf8)FORMAT_BLACK;
}
set_format_arg(0, uintptr_t, &buffer);
gfx_draw_string_left(dpi, STR_STRING, gCommonFormatArgs, w->colours[1], x + 5, y);
@ -982,7 +982,7 @@ void window_title_editor_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int
}
else {
format_string(buffer + 1, 255, commandName, gCommonFormatArgs);
buffer[0] = (error ? ((selected || hover) ? FORMAT_LIGHTPINK : FORMAT_RED) : FORMAT_BLACK);
buffer[0] = (utf8)(error ? ((selected || hover) ? FORMAT_LIGHTPINK : FORMAT_RED) : FORMAT_BLACK);
}
set_format_arg(0, uintptr_t, &buffer);
gfx_draw_string_left(dpi, STR_STRING, gCommonFormatArgs, w->colours[1], x + 5, y);