Added different Music tracks for menu and each level

elimu-ai · Apr 21, 2017 · 57eb8df · 57eb8df
1 parent 5fa119e
commit 57eb8df
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/Classes/MarsScene.cpp b/Classes/MarsScene.cpp
@@ -29,7 +29,7 @@ bool Mars::init()
 	}
 	auto cache = SpriteFrameCache::getInstance();
 	cache->addSpriteFramesWithFile("mars.plist");
-	cache->addSpriteFramesWithFile("marsTips.plist");
+	setupAudio();
 	return true;
 }
 
@@ -41,6 +41,13 @@ void Mars::loadMap()
 	GameMap::loadMap();
 }
 
+void Mars::setupAudio()
+{
+	auto audio = SimpleAudioEngine::getInstance();
+	audio->stopBackgroundMusic();
+	audio->playBackgroundMusic("sfx/marsMusic.mp3", true);
+}
+
 void Mars::setupBackground()
 {
 	dust = ParticleRain::create();

diff --git a/Classes/MenugScene.cpp b/Classes/MenugScene.cpp
@@ -56,11 +56,8 @@ void Menug::loadAudio()
 {
 	auto audio = SimpleAudioEngine::getInstance();
 	audio->preloadEffect("sfx/button.wav");
-	if (!audio->isBackgroundMusicPlaying())
-	{
-		audio->stopBackgroundMusic();
-		audio->playBackgroundMusic("sfx/marsMusic.mp3", true);
-	}
+	audio->stopBackgroundMusic();
+	audio->playBackgroundMusic("sfx/introMusic.mp3", true);
 }
 
 void Menug::cacheImages()

diff --git a/Classes/UranusScene.cpp b/Classes/UranusScene.cpp
@@ -45,9 +45,17 @@ void Uranus::loadMap()
 	setupBackground();
 	setupParallaxImages();
 	setupSpikes();
+	setupAudio();
     GameMap::loadMap();
 }
 
+void Uranus::setupAudio()
+{
+	auto audio = SimpleAudioEngine::getInstance();
+	audio->stopBackgroundMusic();
+	audio->playBackgroundMusic("sfx/uranusMusic.mp3",true);
+}
+
 void Uranus::setupBackground()
 {
 	auto bgSprite = Sprite::createWithSpriteFrameName("bg.png");

diff --git a/Resources/sfx/introMusic.mp3 b/Resources/sfx/introMusic.mp3
diff --git a/Resources/sfx/uranusMusic.mp3 b/Resources/sfx/uranusMusic.mp3