credits music plays on credits screen now

[supertux.git] / src / sector.cpp

diff --git a/src/sector.cpp b/src/sector.cpp
index 063772e..01c4ea6 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -44,28 +44,17 @@
 #include "statistics.h"
 #include "collision_grid.h"
 #include "collision_grid_iterator.h"
+#include "object_factory.h"
 #include "special/collision.h"
 #include "math/rectangle.h"
 #include "math/aatriangle.h"
 #include "object/coin.h"
 #include "object/block.h"
 #include "object/invisible_block.h"
-#include "object/platform.h"
 #include "object/bullet.h"
 #include "badguy/jumpy.h"
-#include "badguy/snowball.h"
-#include "badguy/bouncing_snowball.h"
-#include "badguy/flame.h"
-#include "badguy/flyingsnowball.h"
-#include "badguy/mriceblock.h"
-#include "badguy/mrbomb.h"
-#include "badguy/dispenser.h"
 #include "badguy/spike.h"
-#include "badguy/spiky.h"
-#include "badguy/nolok_01.h"
-#include "trigger/door.h"
 #include "trigger/sequence_trigger.h"
-#include "trigger/secretarea_trigger.h"
 
 Sector* Sector::_current = 0;
 
@@ -103,14 +92,10 @@ Sector::~Sector()
 GameObject*
 Sector::parse_object(const std::string& name, const lisp::Lisp& reader)
 {
-  if(name == "background") {
-    return new Background(reader);
-  } else if(name == "camera") {
+  if(name == "camera") {
     Camera* camera = new Camera(this);
     camera->parse(reader);
     return camera;
-  } else if(name == "tilemap") {
-    return  new TileMap(reader);
   } else if(name == "particles-snow") {
     SnowParticleSystem* partsys = new SnowParticleSystem();
     partsys->parse(reader);
@@ -119,39 +104,16 @@ Sector::parse_object(const std::string& name, const lisp::Lisp& reader)
     CloudParticleSystem* partsys = new CloudParticleSystem();
     partsys->parse(reader);
     return partsys;
-  } else if(name == "door") {
-    return new Door(reader);
-  } else if(name == "secretarea") {
-    return new SecretAreaTrigger(reader);
-  } else if(name == "sequencetrigger") {
-    return new SequenceTrigger(reader);
-  } else if(name == "platform") {
-    return new Platform(reader);
-  } else if(name == "jumpy" || name == "money") {
+  } else if(name == "money") { // for compatibility with old maps
     return new Jumpy(reader);
-  } else if(name == "snowball") {
-    return new SnowBall(reader);
-  } else if(name == "bouncingsnowball") {
-    return new BouncingSnowball(reader);
-  } else if(name == "flame") {
-    return new Flame(reader);
-  } else if(name == "flyingsnowball") {
-    return new FlyingSnowBall(reader);
-  } else if(name == "mriceblock") {
-    return new MrIceBlock(reader);
-  } else if(name == "mrbomb") {
-    return new MrBomb(reader);
-  } else if(name == "dispenser") {
-    return new Dispenser(reader);
-  } else if(name == "spike") {
-    return new Spike(reader);
-  } else if(name == "spiky") {
-    return new Spiky(reader);
-  } else if(name == "nolok_01") {
-    return new Nolok_01(reader);
-  }
-
-  std::cerr << "Unknown object type '" << name << "'.\n";
+  } 
+
+  try {
+    return create_object(name, reader);
+  } catch(std::exception& e) {
+    std::cerr << e.what() << "\n";
+  }
+  
   return 0;
 }
 
@@ -842,6 +804,9 @@ Sector::play_music(int type)
     case HERRING_MUSIC:
       SoundManager::get()->play_music(herring_song);
       break;
+    case CREDITS_MUSIC:
+      SoundManager::get()->play_music(credits_song);
+      break;
     default:
       SoundManager::get()->halt_music();
       break;