From 0c64cb80c8e3c2c704552a7d615c3c29a96add7a Mon Sep 17 00:00:00 2001
From: Thien Trandinh <trandit@mcmaster.ca>
Date: Wed, 30 Nov 2016 00:46:31 -0500
Subject: [PATCH] game over music works
---
src/Blaze-Brigade/Blaze_Brigade/Game.cs | 4 +++-
src/Blaze-Brigade/Blaze_Brigade/Sounds.cs | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Game.cs b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
index ebf1c3f..6997571 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Game.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
@@ -146,7 +146,7 @@ namespace Controller
//player2.addUnit(getNewUnit(UnitType.Warrior, new Vector2(16 * 32f, 9 * 32f), player2));
//player2.addUnit(getNewUnit(UnitType.Warrior, new Vector2(16 * 32f, 10 * 32f), player2));
//player2.addUnit(getNewUnit(UnitType.Warrior, new Vector2(17 * 32f, 11 * 32f), player2));
- player2.addUnit(getNewUnit(UnitType.Mage, new Vector2(32 * 32f, 22 * 32f), player2));
+ /////player2.addUnit(getNewUnit(UnitType.Mage, new Vector2(32 * 32f, 22 * 32f), player2));
//player2.addUnit(getNewUnit(UnitType.Mage, new Vector2(17 * 32f, 10 * 32f), player2));
///player2.addUnit(getNewUnit(UnitType.Archer, new Vector2(32 * 32f, 20 * 32f), player2));
//player2.addUnit(getNewUnit(UnitType.Archer, new Vector2(17 * 32f, 12 * 32f), player2));
@@ -310,6 +310,7 @@ namespace Controller
{
if (menuMusicCounter == 0)
{
+ Sounds.playMapSong(false);
Sounds.playGameOverSong();
menuMusicCounter++;
}
@@ -330,6 +331,7 @@ namespace Controller
{
if (menuMusicCounter == 0)
{
+ Sounds.playMapSong(false);
Sounds.playGameOverSong();
menuMusicCounter++;
}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Sounds.cs b/src/Blaze-Brigade/Blaze_Brigade/Sounds.cs
index 574912a..585c280 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Sounds.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Sounds.cs
@@ -65,7 +65,7 @@ namespace View
}
else
{
- //TODO
+ Controller.Game.Instance.getSounds("MapSong").Dispose();
}
}
--
GitLab