Merge pull request #81 from MyEpitech/endGame/victor

feat(endGame): add handleWin function
Studio-17 · Jun 3, 2022 · 96030a7 · 96030a7
2 parents f85bbd0 + 32d7c77
commit 96030a7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/project/Source/Core/Core.cpp b/project/Source/Core/Core.cpp
@@ -14,6 +14,7 @@
 #include "OptionGameMenuScene.hpp"
 #include "BindingScene.hpp"
 #include "SelectPlayerScene.hpp"
+#include "EndGameScene.hpp"
 
 #include "tools.hpp"
 #include "Map.hpp"
@@ -47,6 +48,7 @@ void Core::loadMenuScenes()
     _menuScenes.emplace(Scene::Scenes::OPTION_GAME, std::make_shared<Scene::OptionGameMenuScene>(_settings, _gameSettings));
     _menuScenes.emplace(Scene::Scenes::SAVE, std::make_shared<Scene::BindingScene>(_settings, _keyboard, _playerActions, std::bind(&Core::bindKey, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)));
     _menuScenes.emplace(Scene::Scenes::SELECT_PLAYER, std::make_shared<Scene::SelectPlayerScene>(_settings, _gameSettings));
+    _menuScenes.emplace(Scene::Scenes::END_GAME, std::make_shared<Scene::EndGameScene>(_settings, _gameSettings));
     //rajouter toutes les scènes des menus
 }
 

diff --git a/project/Source/Scenes/GameScenes/EndGameScene.hpp b/project/Source/Scenes/GameScenes/EndGameScene.hpp
@@ -22,6 +22,8 @@ namespace Scene {
             void loadSceneAssets();
             void goToMainMenu();
             void draw () override;
+            void fadeBlack() override {};
+            Scenes handleEvent() override {};
 
         protected:
         private:

diff --git a/project/Source/Scenes/GameScenes/GameScene.cpp b/project/Source/Scenes/GameScenes/GameScene.cpp
@@ -161,6 +161,7 @@ Scene::Scenes Scene::GameScene::handleEvent()
             player->animation(1);
         index++;
     }
+    handleWin();
     handleBombs();
     return _nextScene;
 }
@@ -219,8 +220,8 @@ void Scene::GameScene::checkIfPlayerIsInRange(std::pair<int, int> const &explosi
     for (auto &[index, player] : _players) {
         playerPos = _gameMap->transposeFrom3Dto2D(player->getPosition());
         if (playerPos == explosionPos) {
-            std::cout << "died" << std::endl;
             player->die();
+            _players.erase(index);
         }
     }
 }
@@ -257,6 +258,14 @@ void Scene::GameScene::exploseBomb(Position const &position, int radius)
     }
 }
 
+void Scene::GameScene::handleWin()
+{
+    // Changement de scene segfault actuellement
+    // if (_players.size() == 3) {
+    //     _nextScene = Scene::Scenes::END_GAME;
+    // }
+}
+
 void Scene::GameScene::draw()
 {
     _settings->getCamera()->startMode3D();

diff --git a/project/Source/Scenes/GameScenes/GameScene.hpp b/project/Source/Scenes/GameScenes/GameScene.hpp
@@ -61,6 +61,8 @@ namespace Scene {
 
             void checkIfPlayerIsInRange(std::pair<int, int> const &explosionPos);
 
+            void handleWin();
+
         protected:
         private:
             std::shared_ptr<GameSettings> _gameSettings;

diff --git a/project/Source/Scenes/IScene.hpp b/project/Source/Scenes/IScene.hpp
@@ -24,7 +24,8 @@ namespace Scene
         END,
         OPTION_GAME,
         SELECT_MAP,
-        SELECT_PLAYER
+        SELECT_PLAYER,
+        END_GAME
     };
 
     enum SOUNDS {