diff --git a/assets/sound/monster-zombie-scream-105972.wav b/assets/sound/monsterSlash.wav similarity index 100% rename from assets/sound/monster-zombie-scream-105972.wav rename to assets/sound/monsterSlash.wav diff --git a/include/game/GameEntities.hpp b/include/game/GameEntities.hpp index 72f7b7b5d923ba43a72f84e6c068057f51958837..e9f87bdd5dfffe4f2848165eff4a06eb274e1578 100644 --- a/include/game/GameEntities.hpp +++ b/include/game/GameEntities.hpp @@ -126,7 +126,7 @@ class Being : public Entity // Points de vie actuels. int currHp=100; // Points de vie maximum. - int maxHp=100; + int maxHp; // Can take damage. bool CTD; }; diff --git a/include/manager/SoundManager.hpp b/include/manager/SoundManager.hpp index 70464e2d896f5ddb3cb7b626e40b9519b77461da..d74c3e755265a25598cedf03ebb7c67ed8ff2bca 100644 --- a/include/manager/SoundManager.hpp +++ b/include/manager/SoundManager.hpp @@ -20,7 +20,7 @@ class SoundManager{ shootingBow = Mix_LoadWAV("../assets/sound/bow_shoot.wav"); hitBow = Mix_LoadWAV("../assets/sound/arrowHit.wav"); walkingGrass = Mix_LoadWAV("../assets/sound/walkingGrass.wav"); - monsterSlash = Mix_LoadWAV("../assets/sound/walkingGrass.wav"); + monsterSlash = Mix_LoadWAV("../assets/sound/monsterSlash.wav"); Mix_Volume(-1,128); } diff --git a/src/manager/MenuManager.cpp b/src/manager/MenuManager.cpp index e95140fc313945321a39effc36386a190ddad36d..81b103b8e10c8fb2ed663e7e509c14d3b09ed4ff 100644 --- a/src/manager/MenuManager.cpp +++ b/src/manager/MenuManager.cpp @@ -56,7 +56,7 @@ void MenuManager::menu(){ NK_WINDOW_BORDER | NK_WINDOW_NO_SCROLLBAR)) { - string startGame = (game->getLoadedSave()=="" && !game->isInGame() ? "Nouvelle partie" : "Reprendre la partie"); + string startGame = "Nouvelle partie"; float ratio[] = {0.1f, 0.80f,0.1f}; int h = menu_height / 15; nk_layout_row(ctx, NK_DYNAMIC, h, 3, ratio); @@ -66,14 +66,8 @@ void MenuManager::menu(){ nk_spacer(ctx); if (nk_button_label(ctx, startGame.c_str())) { game->setState(InGame); - - if(!game->isInGame()){ - game->buildWorld(); - SoundManager::getInstance().PlayMusicBackground(); - } - else{ - SoundManager::getInstance().resumeMusicBackground(); - } + game->buildWorld(); + SoundManager::getInstance().PlayMusicBackground(); } nk_spacer(ctx);