diff --git a/config.yml b/config.yml index 460e3f9..08ae95f 100644 --- a/config.yml +++ b/config.yml @@ -68,7 +68,7 @@ players: startXPosition: 600 fireCooldown: 10 speed: 10 - lives: 100 + lives: 3 user1: color: red keys: diff --git a/headers/god.h b/headers/god.h index 6999ad0..34361d9 100644 --- a/headers/god.h +++ b/headers/god.h @@ -27,7 +27,6 @@ enum class GodState{ RETRIEVE1, RETRIEVE2, THROW, - YOLO, }; diff --git a/headers/pixelManager/pixelManager.h b/headers/pixelManager/pixelManager.h index 6b9eb2f..c23014e 100644 --- a/headers/pixelManager/pixelManager.h +++ b/headers/pixelManager/pixelManager.h @@ -162,7 +162,7 @@ public: * @param[in] pos : pixel coordinates to draw the sprite * @fn void drawSprite(const MySprite& msp, const Position& pos = Position(0, 0)) const; */ - void drawSprite(const MySprite& msp, const Position& pos = Position(0, 0)) const; + void drawSprite(const MySprite& msp, const Position& pos) const; /*! * @brief display a menu button on screen diff --git a/src/game/display.cpp b/src/game/display.cpp index 1dbc4c9..df5be6f 100644 --- a/src/game/display.cpp +++ b/src/game/display.cpp @@ -16,7 +16,7 @@ * The more important stuff must be drawn last */ void Game::displayAll(unsigned fps) const { - pm->drawSprite(pm->gameBackground); + pm->drawSprite(pm->gameBackground, Position(0, 0)); for (unsigned i = 0; i < this->grid.size(); ++i){ for (unsigned j = 0; j < this->grid[i].size(); ++j){ Position vec( @@ -113,8 +113,8 @@ void Game::displayGod() const { Position leftHand(GOD_HAND_DISTANCE, god.counter-GOD_BENCH_SIZE); Position rightHand(pm->getScreenWidth()-GOD_HAND_DISTANCE-GOD_HAND_SIZE, god.counter-GOD_BENCH_SIZE); - pm->drawSprite(pm->leftHand); - pm->drawSprite(pm->rightHand); + pm->drawSprite(pm->leftHand, leftHand); + pm->drawSprite(pm->rightHand, rightHand); pm->drawGodFace(god.counter - GOD_BENCH_SIZE); break; } @@ -122,8 +122,8 @@ void Game::displayGod() const { pm->drawGodBench(0); Position leftHand(GOD_HAND_DISTANCE, 0); Position rightHand(god.getRightHandPos(pm->getScreenWidth())); - pm->drawSprite(pm->leftHand); - pm->drawSprite(pm->rightHand); + pm->drawSprite(pm->leftHand, leftHand); + pm->drawSprite(pm->rightHand, rightHand); pm->drawGodFace(0); break; } @@ -172,7 +172,7 @@ void Game::displayGod() const { else handCounter = 30-god.counter; handPos = handPos + god.thrownVector * (handCounter / 100.0); } - pm->drawSprite(pm->rightHand); + pm->drawSprite(pm->rightHand, handPos); break; } diff --git a/src/game/godManager.cpp b/src/game/godManager.cpp index cfd3d1a..edfdb39 100644 --- a/src/game/godManager.cpp +++ b/src/game/godManager.cpp @@ -135,7 +135,6 @@ bool Game::manageGod() { if (touched) { god.state = GodState::WAIT; god.counter = 0; - if(!areThereInvadersLeft())return true; } /* we do not need to reset other members, they'll be treated as non-initialized * When we cycle back between states*/ @@ -143,9 +142,7 @@ bool Game::manageGod() { return false; } - case GodState::YOLO: { - } } throw runtime_error("SHOULD NOT HAPPEN : invalid action for god : ID="+ to_string(static_cast(god.state))); } diff --git a/src/pixelManager/drawMenus.cpp b/src/pixelManager/drawMenus.cpp index aeb5b0d..cd69bb9 100644 --- a/src/pixelManager/drawMenus.cpp +++ b/src/pixelManager/drawMenus.cpp @@ -27,7 +27,7 @@ void PixelManager::displayButton(const Position& baseVector, const string& text, void PixelManager::displayMenu(const Position& pos, Menu& currentMenu){ startFrame(); - drawSprite(menuBackground); + drawSprite(menuBackground, Position(0, 0)); drawSprite(logo,Position(100,50)); drawText(Position(1150, 700), "version 1.0.0"); unsigned margin = 0; @@ -43,7 +43,7 @@ void PixelManager::displayMenu(const Position& pos, Menu& currentMenu){ void PixelManager::displayMenu(const Position& pos, Menu& currentMenu, const vector& rankings){ startFrame(); - drawSprite(menuBackground); + drawSprite(menuBackground, Position(0, 0)); drawSprite(logo,Position(100,50)); drawText(Position(1150, 700), "version 1.0.0"); unsigned margin = 0; @@ -105,7 +105,7 @@ void PixelManager::askPlayerNameMenu(playerID pID, unsigned score, string& name) chrono::milliseconds waitTime = chrono::milliseconds(100); while (window.isOpen()){ startFrame(); - drawSprite(menuBackground); + drawSprite(menuBackground, Position(0, 0)); drawText(Position(600, 100), "Nom du joueur " + to_string(pID + 1)); drawText(Position(600, 150), "Score : " + to_string(score)); for (unsigned i = 0; i < name.size(); ++i){