diff options
author | Vittorio Romeo <vittorio.romeo@outlook.com> | 2013-06-16 19:45:20 +0200 |
---|---|---|
committer | Vittorio Romeo <vittorio.romeo@outlook.com> | 2013-06-16 19:45:20 +0200 |
commit | adc72e34d6f8fa19e1bdd0e1249861568bc383e3 (patch) | |
tree | 3fe472db7eeba18313365e581faa5192b13fb233 | |
parent | 77784ae142768f964666afacfeed74300501ec07 (diff) |
Made hotfix prettier1.92a
-rwxr-xr-x | include/SSVOpenHexagon/Core/HexagonGame.h | 5 | ||||
-rwxr-xr-x | src/SSVOpenHexagon/Core/HexagonGame.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/SSVOpenHexagon/Core/HexagonGame.h b/include/SSVOpenHexagon/Core/HexagonGame.h index 0f83075a..fa2e745c 100755 --- a/include/SSVOpenHexagon/Core/HexagonGame.h +++ b/include/SSVOpenHexagon/Core/HexagonGame.h @@ -33,7 +33,7 @@ namespace hg class HexagonGame { - private: void wtf(); + private: ssvs::GameState game; ssvs::GameWindow& window; sses::Manager manager; @@ -114,6 +114,9 @@ namespace hg void invalidateScore(); + // Hotfix + void clearAndResetTimeline(); + public: MenuGame* mgPtr; diff --git a/src/SSVOpenHexagon/Core/HexagonGame.cpp b/src/SSVOpenHexagon/Core/HexagonGame.cpp index 7465da91..9eee9555 100755 --- a/src/SSVOpenHexagon/Core/HexagonGame.cpp +++ b/src/SSVOpenHexagon/Core/HexagonGame.cpp @@ -125,7 +125,7 @@ namespace hg status.fastSpin = levelData.getFastSpin(); timeline.insert<Do>(timeline.getCurrentIndex() + 1, [&]{ sideChange(getRnd(levelData.getSidesMin(), levelData.getSidesMax() + 1)); }); } - void HexagonGame::wtf() { timeline.clear(); timeline.reset(); } + void HexagonGame::clearAndResetTimeline() { timeline.clear(); timeline.reset(); } void HexagonGame::sideChange(int mSideNumber) { if(manager.getComponents("wall").size() > 0) |