From eb25f940bd7b627c3958aef53296ba288a73e53f Mon Sep 17 00:00:00 2001 From: Thomas R Date: Sat, 1 Jan 2022 15:42:32 +0100 Subject: [PATCH] fuck me --- src/configManagement.cpp | 16 ++++++++-------- src/game_basics.cpp | 3 ++- src/game_managers.cpp | 1 + 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/configManagement.cpp b/src/configManagement.cpp index 80343c5..ec8ece1 100644 --- a/src/configManagement.cpp +++ b/src/configManagement.cpp @@ -81,15 +81,15 @@ void ConfigBuilder::readConfig() { // the scalability behind the vector of players is only an illusion, because we force player count to be 1 or 2 // It was done so the 2+ players implementation could be easier in the future, if wanted collectedData.playerDefs.resize(2); - collectedData.playerDefs[1].color = getColor("players.user1.color"); - collectedData.playerDefs[1].keys.left = getChar("players.user1.keys.left"); - collectedData.playerDefs[1].keys.right = getChar("players.user1.keys.right"); - collectedData.playerDefs[1].keys.shoot = getChar("players.user1.keys.shoot"); + collectedData.playerDefs[0].color = getColor("players.user1.color"); + collectedData.playerDefs[0].keys.left = getChar("players.user1.keys.left"); + collectedData.playerDefs[0].keys.right = getChar("players.user1.keys.right"); + collectedData.playerDefs[0].keys.shoot = getChar("players.user1.keys.shoot"); - collectedData.playerDefs[2].color = getColor("players.user2.color"); - collectedData.playerDefs[2].keys.left = getChar("players.user2.keys.left"); - collectedData.playerDefs[2].keys.right = getChar("players.user2.keys.right"); - collectedData.playerDefs[2].keys.shoot = getChar("players.user2.keys.shoot"); + collectedData.playerDefs[1].color = getColor("players.user2.color"); + collectedData.playerDefs[1].keys.left = getChar("players.user2.keys.left"); + collectedData.playerDefs[1].keys.right = getChar("players.user2.keys.right"); + collectedData.playerDefs[1].keys.shoot = getChar("players.user2.keys.shoot"); // invaders collectedData.invadersSize = getInt("invaders.size"); diff --git a/src/game_basics.cpp b/src/game_basics.cpp index dbb57f0..e83aa7a 100644 --- a/src/game_basics.cpp +++ b/src/game_basics.cpp @@ -91,7 +91,7 @@ WinValue Game::playGame(){ // returns when game is finished // GAMELOOP #define FPS 1000 - while(true){ + while(window.isOpen()){ auto targetTime = chrono::high_resolution_clock::now() + chrono::duration>(1); pm.startFrame(); @@ -113,6 +113,7 @@ WinValue Game::playGame(){ // returns when game is finished this_thread::sleep_until(targetTime); } + return WinValue::NOBODY; } /** Displays the screen once, and returns diff --git a/src/game_managers.cpp b/src/game_managers.cpp index f4b6210..5b3a4e2 100644 --- a/src/game_managers.cpp +++ b/src/game_managers.cpp @@ -137,6 +137,7 @@ bool Game::checkMissilesAndPlayers() { else ++miss_ite; } } + return false; // TODO manage death animation } bool Game::checkTorpedosAndInvaders() {