From 900f3cd92ba47d6108abb73af95f9af81c08c8f7 Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 16 Dec 2020 22:37:35 +0000 Subject: [PATCH] Fix gcc / clang builds --- src/openrct2-ui/input/InputManager.cpp | 2 +- src/openrct2-ui/input/ShortcutManager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2-ui/input/InputManager.cpp b/src/openrct2-ui/input/InputManager.cpp index 23caea0e62..1817e7dfd7 100644 --- a/src/openrct2-ui/input/InputManager.cpp +++ b/src/openrct2-ui/input/InputManager.cpp @@ -109,7 +109,7 @@ void InputManager::HandleViewScrolling() // Shortcut scrolling auto mainWindow = window_get_main(); - if (mainWindow != nullptr && _viewScroll.x != 0 || _viewScroll.y != 0) + if (mainWindow != nullptr && (_viewScroll.x != 0 || _viewScroll.y != 0)) { window_unfollow_sprite(mainWindow); } diff --git a/src/openrct2-ui/input/ShortcutManager.cpp b/src/openrct2-ui/input/ShortcutManager.cpp index d13a5a1215..8d6cf971ae 100644 --- a/src/openrct2-ui/input/ShortcutManager.cpp +++ b/src/openrct2-ui/input/ShortcutManager.cpp @@ -86,7 +86,7 @@ static uint32_t ParseKey(const std::string_view& text) return 0; } -size_t FindPlus(std::string_view s, size_t index) +static size_t FindPlus(std::string_view s, size_t index) { while (true) {