diff options
| author | Vittorio Romeo <vittorio.romeo@outlook.com> | 2022-01-07 22:55:05 +0100 |
|---|---|---|
| committer | Vittorio Romeo <vittorio.romeo@outlook.com> | 2022-01-07 22:55:05 +0100 |
| commit | 2a6e7879bdce84595513c59c6ae6eb7e9d3830c9 (patch) | |
| tree | 973c5cc2104efebed7826e80c8bacf9491ef5468 | |
| parent | 7c801d2ddcdf8ce58693e683ab65ea49b7a6ca4f (diff) | |
Update to latest SFML
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/SSVOpenHexagon/Core/MenuGame.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cf48d739..0eb944ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,9 +38,9 @@ endif() option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." FALSE) if(${FORCE_COLORED_OUTPUT}) - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR (CMAKE_CXX_COMPILER MATCHES "g\\+\\+")) add_compile_options("-fdiagnostics-color=always") - elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR (CMAKE_CXX_COMPILER MATCHES "clang\\+\\+")) add_compile_options("-fcolor-diagnostics") endif() endif() @@ -95,7 +95,7 @@ set(SFML_STATIC_LIBRARIES false) CPMAddPackage( NAME SFML GITHUB_REPOSITORY vittorioromeo/SFML - GIT_TAG 77d72ceb93be89d08b9691fbb177b8372600216d + GIT_TAG 8d88c9dc9c506760a37af0b1bd1f924ecdbd587f ) set_target_properties(sfml-system PROPERTIES UNITY_BUILD ON) diff --git a/src/SSVOpenHexagon/Core/MenuGame.cpp b/src/SSVOpenHexagon/Core/MenuGame.cpp index 7e5aadee..ae5b2b37 100644 --- a/src/SSVOpenHexagon/Core/MenuGame.cpp +++ b/src/SSVOpenHexagon/Core/MenuGame.cpp @@ -3124,7 +3124,7 @@ void MenuGame::refreshCamera() {ssvs::zeroVec2f, {Config::getSizeX() * Config::getZoomFactor(), Config::getSizeY() * Config::getZoomFactor()}}); - overlayCamera.setView(sf::View{sf::FloatRect(0, 0, w, h)}); + overlayCamera.setView(sf::View{sf::FloatRect({0, 0}, {w, h})}); titleBar.setOrigin(ssvs::zeroVec2f); titleBar.setScale({0.5f, 0.5f}); @@ -5940,7 +5940,7 @@ void MenuGame::drawGraphics() void MenuGame::drawOnlineStatus() { window.getRenderWindow().setView( - sf::View{{0.f, 0.f, getWindowWidth(), getWindowHeight()}}); + sf::View{{{0.f, 0.f}, {getWindowWidth(), getWindowHeight()}}}); const float onlineStatusScaling = 1.5f; const float scaling = onlineStatusScaling / Config::getZoomFactor(); |