final

BackgroundGames · May 12, 2024 · c10bb4b · c10bb4b
1 parent db8a626
commit c10bb4b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/Game/Source/Audio.cpp b/Game/Source/Audio.cpp
@@ -197,8 +197,8 @@ void Audio::ChangeFxVolume(float percent)
 
 void Audio::UnloadFx(unsigned int id)
 {
-	Mix_FreeChunk(fx[id]);
-	fx[id] = nullptr;
+	//Mix_FreeChunk(fx[id]);
+	//fx[id] = nullptr;
 }
 
 void Audio::StopFx(unsigned int channel)

diff --git a/Game/Source/Intro.cpp b/Game/Source/Intro.cpp
@@ -24,7 +24,6 @@ bool Intro::Awake(pugi::xml_node config)
 	animation.loop = false;
 	animation.PushBack({0,0,1280,720});
 	animation.PushBack({ 1280,0,1280,720 });
-	animation.PushBack({ 0,720,1280,720 });
 	animation.PushBack({ 1280,720,1280,720 });
 	return true;
 }

diff --git a/Game/Source/InventoryMenu.cpp b/Game/Source/InventoryMenu.cpp
@@ -82,6 +82,13 @@ bool InventoryMenu::PostUpdate()
 		}
 	}
 
+	app->render->DrawText("health:", 300, 120, 130, 20, 255, 255, 255, 0);
+	app->render->DrawText("3", 440, 120, 20, 20, 255, 255, 255, 0);
+	app->render->DrawText("damge:", 300, 145, 110, 20, 255, 255, 255, 0);
+	app->render->DrawText("1", 440, 145, 20, 20, 255, 255, 255, 0);
+	app->render->DrawText("mvp:", 300, 170, 70, 20, 255, 255, 255, 0);
+	app->render->DrawText("3", 440, 170, 20, 20, 255, 255, 255, 0);
+
 	return true;
 }
 

diff --git a/Game/Source/LoseScreen.cpp b/Game/Source/LoseScreen.cpp
@@ -26,7 +26,7 @@ bool LoseScreen::Start()
 	app->render->camera.x = 0;
 	app->render->camera.y = 0;
 	app->win->GetWindowSize(windowW, windowH);
-	app->audio->PlayMusic(sceneconfig.attribute("audio").as_string());
+	app->audio->PlayMusic(sceneconfig.attribute("audio").as_string(),0);
 	return true;
 }
 

diff --git a/Game/Source/Player.cpp b/Game/Source/Player.cpp
@@ -71,7 +71,7 @@ bool Player::Update(float dt)
 		switch (exploringState)
 		{
 		case ExploringState::IDLE:
-
+			//app->audio->StopFx(sandChannel);
 			ResetPath();
 
 			if (PosState == Direction::UL || PosState == Direction::UR) {

diff --git a/Game/Source/QuestManager.cpp b/Game/Source/QuestManager.cpp
@@ -68,7 +68,7 @@ bool QuestManager::PostUpdate()
 
 bool QuestManager::CleanUp()
 {
-    app->audio->UnloadFx(questComplete);
+    //app->audio->UnloadFx(questComplete);
     for (size_t i = 0; i < activeQuests.size(); i++)
     {
         delete activeQuests.at(i);