mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix some warnings with clang and GCC
This commit is contained in:
parent
e133585727
commit
423028dac9
|
@ -77,7 +77,6 @@ namespace OpenRCT2
|
||||||
IScenarioRepository * _scenarioRepository = nullptr;
|
IScenarioRepository * _scenarioRepository = nullptr;
|
||||||
|
|
||||||
bool _isWindowMinimised = false;
|
bool _isWindowMinimised = false;
|
||||||
uint32 _isWindowMinimisedLastCheckTick = 0;
|
|
||||||
uint32 _lastTick = 0;
|
uint32 _lastTick = 0;
|
||||||
uint32 _uncapTick = 0;
|
uint32 _uncapTick = 0;
|
||||||
|
|
||||||
|
@ -138,7 +137,7 @@ namespace OpenRCT2
|
||||||
/**
|
/**
|
||||||
* Causes the OpenRCT2 game loop to finish.
|
* Causes the OpenRCT2 game loop to finish.
|
||||||
*/
|
*/
|
||||||
void Finish()
|
void Finish() override
|
||||||
{
|
{
|
||||||
_finished = true;
|
_finished = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,8 +14,6 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
#pragma endregion
|
#pragma endregion
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "Platform2.h"
|
#include "Platform2.h"
|
||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
|
|
|
@ -280,7 +280,7 @@ static void window_text_input_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
||||||
size_t char_count = 0;
|
size_t char_count = 0;
|
||||||
uint8 cur_drawn = 0;
|
uint8 cur_drawn = 0;
|
||||||
|
|
||||||
sint32 cursorX = 0, cursorY = 0;
|
sint32 cursorX = 0;
|
||||||
for (sint32 line = 0; line <= no_lines; line++) {
|
for (sint32 line = 0; line <= no_lines; line++) {
|
||||||
gfx_draw_string(dpi, wrap_pointer, w->colours[1], w->x + 12, y);
|
gfx_draw_string(dpi, wrap_pointer, w->colours[1], w->x + 12, y);
|
||||||
|
|
||||||
|
@ -291,7 +291,6 @@ static void window_text_input_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
||||||
char temp_string[TEXT_INPUT_SIZE] = { 0 };
|
char temp_string[TEXT_INPUT_SIZE] = { 0 };
|
||||||
memcpy(temp_string, wrap_pointer, gTextInput->SelectionStart - char_count);
|
memcpy(temp_string, wrap_pointer, gTextInput->SelectionStart - char_count);
|
||||||
cursorX = w->x + 13 + gfx_get_string_width(temp_string);
|
cursorX = w->x + 13 + gfx_get_string_width(temp_string);
|
||||||
cursorY = y;
|
|
||||||
|
|
||||||
sint32 width = 6;
|
sint32 width = 6;
|
||||||
if (gTextInput->SelectionStart < strlen(text_input)){
|
if (gTextInput->SelectionStart < strlen(text_input)){
|
||||||
|
@ -322,7 +321,6 @@ static void window_text_input_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
||||||
|
|
||||||
if (!cur_drawn) {
|
if (!cur_drawn) {
|
||||||
cursorX = gLastDrawStringX;
|
cursorX = gLastDrawStringX;
|
||||||
cursorY = y - 10;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// IME composition
|
// IME composition
|
||||||
|
|
Loading…
Reference in New Issue