fixed loading memory issue

crazyit · Mar 13, 2014 · 60a2c83 · 60a2c83
1 parent 614ffd2
commit 60a2c83
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/Classes/Enemies.cpp b/Classes/Enemies.cpp
@@ -229,7 +229,7 @@ bool Boss::init(){
         _Model->setRotation3D(Vertex3F(90,0,0));
         static_cast<Sprite3D*>(_Model)->setOutline(0.1, Color3B(0,0,0));
         _type = kEnemyBoss;
-        _HP = 10000;
+        _HP = 500;
         _radius = 150;
         auto cannon1 = Sprite3D::create("bossCannon.obj", "boss.png");
         _Cannon1 = Node::create();
@@ -390,9 +390,11 @@ void Boss::dead(){
     EnemyController::showCaseEnemies.eraseObject(this);
     removeFromParent();
     CocosDenshion::SimpleAudioEngine::getInstance()->stopBackgroundMusic();
+
 }
 void Boss::die(){
     //sequence to 10 random explosion
+    stopAllActions();
     Vector<FiniteTimeAction*> explosions;
     for(int i = 0; i < 22; i++)
     {
@@ -413,6 +415,7 @@ void Boss::die(){
     auto final = Sequence::create(giantExpl, giantExpl2, callDead,nullptr);
     runAction(final);
     dying();
+
 }
 
 Point Boss::_getCannon1Position()

diff --git a/Classes/GameLayer.cpp b/Classes/GameLayer.cpp
@@ -186,6 +186,8 @@ void GameLayer::gameMaster(float dt)
         auto boss = EnemyController::spawnEnemy(kEnemyBoss);
         boss->setPosition(0,800);
         CocosDenshion::SimpleAudioEngine::getInstance()->stopBackgroundMusic();
+        // Music By Matthew Pable (http://www.matthewpablo.com/)
+        // Licensed under CC-BY 3.0 (http://creativecommons.org/licenses/by/3.0/)
         CocosDenshion::SimpleAudioEngine::getInstance()->playBackgroundMusic("Orbital Colossus_0.mp3", true);
     }
 }

diff --git a/Classes/LoadingScene.cpp b/Classes/LoadingScene.cpp
@@ -108,8 +108,8 @@ void LoadingScene::LoadingMusic()
     Audio->preloadEffect("hit.mp3");
     Audio->preloadEffect("boom2.mp3");
     Audio->preloadEffect("boom.mp3");
-    Audio->preloadEffect("Orbital Colossus_0.mp3");
-    Audio->preloadEffect("Star_Chaser.mp3");
+    Audio->preloadBackgroundMusic("Orbital Colossus_0.mp3");
+    //Audio->preloadBackgroundMusic("Star_Chaser.mp3");
 
     // Music By Matthew Pable (http://www.matthewpablo.com/)
     // Licensed under CC-BY 3.0 (http://creativecommons.org/licenses/by/3.0/)

diff --git a/Classes/MainMenuScene.cpp b/Classes/MainMenuScene.cpp
@@ -35,6 +35,8 @@ bool MainMenuScene::init()
     {
         return false;
     }
+    // Music By Matthew Pable (http://www.matthewpablo.com/)
+    // Licensed under CC-BY 3.0 (http://creativecommons.org/licenses/by/3.0/)
     CocosDenshion::SimpleAudioEngine::getInstance()->playBackgroundMusic("Star_Chaser.mp3");
 
     SpriteFrameCache::getInstance()->addSpriteFramesWithFile("EarthWarrior.plist","EarthWarrior.png");

diff --git a/Resources/Orbital Colossus_0.mp3 b/Resources/Orbital Colossus_0.mp3