diff options
| author | vittorioromeo <vittorio.romeo@outlook.com> | 2024-02-20 20:07:43 +0100 |
|---|---|---|
| committer | vittorioromeo <vittorio.romeo@outlook.com> | 2024-02-20 20:07:43 +0100 |
| commit | c168e235d99f358e46f38316e6f28cb34fab1d9f (patch) | |
| tree | 69ca84e1e1b2f592aa9ad61ce6f58f7997e1f57f | |
| parent | 57bbea9ac35ba591171930dff4175cd143361d3b (diff) | |
update to latest SFMLdevelop
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/SSVOpenHexagon/Core/HexagonGame.cpp | 12 | ||||
| -rw-r--r-- | src/SSVOpenHexagon/Global/Config.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 122b6124..df83038b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ set(SFML_ENABLE_PCH true) CPMAddPackage( NAME SFML GITHUB_REPOSITORY vittorioromeo/SFML - GIT_TAG d3596fdeaaa0ecef0b66f7296bca6a3ceac53e66 + GIT_TAG b97c9c7f0b552ff7e1e6f0fa51abe82b949e241d ) set_target_properties(sfml-system PROPERTIES UNITY_BUILD OFF) diff --git a/src/SSVOpenHexagon/Core/HexagonGame.cpp b/src/SSVOpenHexagon/Core/HexagonGame.cpp index 7ebbe1da..953fd41e 100644 --- a/src/SSVOpenHexagon/Core/HexagonGame.cpp +++ b/src/SSVOpenHexagon/Core/HexagonGame.cpp @@ -292,6 +292,11 @@ HexagonGame::HexagonGame(Steam::steam_manager* mSteamManager, pbText{initText(fontBold, "", 65.f)}, txStarParticle{nullptr}, txSmallCircle{nullptr}, + keyIconLeft{assets.getTextureOrNullTexture("keyArrow.png")}, + keyIconRight{assets.getTextureOrNullTexture("keyArrow.png")}, + keyIconFocus{assets.getTextureOrNullTexture("keyFocus.png")}, + keyIconSwap{assets.getTextureOrNullTexture("keySwap.png")}, + replayIcon{assets.getTextureOrNullTexture("replayIcon.png")}, levelInfoTextLevel{font, ""}, levelInfoTextPack{font, ""}, levelInfoTextAuthor{font, ""}, @@ -301,12 +306,7 @@ HexagonGame::HexagonGame(Steam::steam_manager* mSteamManager, fpsText{initText(font, "0", 25.f)}, timeText{initText(fontBold, "0", 70.f)}, text{initText(font, "", 25.f)}, - replayText{initText(font, "", 20.f)}, - keyIconLeft{assets.getTextureOrNullTexture("keyArrow.png")}, - keyIconRight{assets.getTextureOrNullTexture("keyArrow.png")}, - keyIconFocus{assets.getTextureOrNullTexture("keyFocus.png")}, - keyIconSwap{assets.getTextureOrNullTexture("keySwap.png")}, - replayIcon{assets.getTextureOrNullTexture("replayIcon.png")} + replayText{initText(font, "", 20.f)} { if(window != nullptr) { diff --git a/src/SSVOpenHexagon/Global/Config.cpp b/src/SSVOpenHexagon/Global/Config.cpp index 57691857..3b32c02b 100644 --- a/src/SSVOpenHexagon/Global/Config.cpp +++ b/src/SSVOpenHexagon/Global/Config.cpp @@ -1467,7 +1467,7 @@ const std::array<TriggerGetter, toSizeT(Tid::TriggersCount)> triggerGetters{ } const auto keyBind{c.getKeys()}; - for(j = 0; j <= sf::Keyboard::KeyCount; ++j) + for(j = 0; j <= static_cast<int>(sf::Keyboard::KeyCount); ++j) { if(!keyBind[j]) { @@ -1486,7 +1486,7 @@ const std::array<TriggerGetter, toSizeT(Tid::TriggersCount)> triggerGetters{ } const auto btnBinds{c.getBtns()}; - for(j = 0; j <= sf::Mouse::ButtonCount; ++j) + for(j = 0; j <= static_cast<int>(sf::Mouse::ButtonCount); ++j) { if(!btnBinds[j]) { |