From 76db6c0ca4a23a43c357430a02c7bf1b57ab8362 Mon Sep 17 00:00:00 2001
From: alexis <alexischapusot@gmail.com>
Date: Tue, 18 Jun 2024 10:55:23 +0200
Subject: [PATCH] modificition isInGame
---
...er-zombie-scream-105972.wav => monsterSlash.wav} | Bin
include/game/GameEntities.hpp | 2 +-
include/manager/SoundManager.hpp | 2 +-
src/manager/MenuManager.cpp | 12 +++---------
4 files changed, 5 insertions(+), 11 deletions(-)
rename assets/sound/{monster-zombie-scream-105972.wav => monsterSlash.wav} (100%)
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 72f7b7b..e9f87bd 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 70464e2..d74c3e7 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 e95140f..81b103b 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);
--
GitLab