mirrors
/
OpenLoco
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix clang 10 compilation

This commit is contained in:
ceeac 2020-06-20 10:34:28 +02:00
parent 4aaa16c2e3
commit 55ee4e679d
No known key found for this signature in database
GPG Key ID: 9239EBCFC52841F7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/openloco/platform/platform.h
View File

@ -1,6 +1,7 @@
#pragma once
#include <cstdint>
#include <vector>
#include "../core/FileSystem.hpp"

4
src/openloco/windows/CompanyWindow.cpp
View File

@ -454,7 +454,7 @@ namespace openloco::ui::windows::CompanyWindow
static void noViewportPresent(window* const self, const SavedView& view)
{
uint16_t vpFlags = 0;
if (config::get().flags && config::flags::gridlines_on_landscape)
if (config::get().flags & config::flags::gridlines_on_landscape)
{
vpFlags |= viewport_flags::gridlines_on_landscape;
}
@ -1059,7 +1059,7 @@ namespace openloco::ui::windows::CompanyWindow
uint16_t vpFlags = 0;
if (self->viewports[0] == nullptr)
{
if (config::get().flags && config::flags::gridlines_on_landscape)
if (config::get().flags & config::flags::gridlines_on_landscape)
{
vpFlags |= viewport_flags::gridlines_on_landscape;
}

2
src/openloco/windows/about_music.cpp
View File

@ -134,7 +134,7 @@ namespace openloco::ui::about_music
const int16_t x = 240;
int16_t y = 2;
for (const auto song_strings : strings_to_draw)
for (const auto& song_strings : strings_to_draw)
{
// TODO: optimisation: don't draw past fold.