Fix music not properly fading in again

[supertux.git] / src / supertux / object_factory.cpp

diff --git a/src/supertux/object_factory.cpp b/src/supertux/object_factory.cpp
index 2250822..006060f 100644 (file)
--- a/src/supertux/object_factory.cpp
+++ b/src/supertux/object_factory.cpp
@@ -44,7 +44,6 @@
 #include "badguy/igel.hpp"
 #include "badguy/jumpy.hpp"
 #include "badguy/kamikazesnowball.hpp"
-#include "badguy/kirby.hpp"
 #include "badguy/kugelblitz.hpp"
 #include "badguy/livefire.hpp"
 #include "badguy/mole.hpp"
@@ -89,6 +88,7 @@
 #include "object/bullet.hpp"
 #include "object/camera.hpp"
 #include "object/candle.hpp"
+#include "object/torch.hpp"
 #include "object/cloud_particle_system.hpp"
 #include "object/coin.hpp"
 #include "object/coin_explode.hpp"
@@ -201,7 +201,6 @@ ObjectFactory::init_factories()
   add_factory<Igel>("igel");
   add_factory<Jumpy>("jumpy");
   add_factory<KamikazeSnowball>("kamikazesnowball");
-  add_factory<Kirby>("kirby");
   add_factory<Kugelblitz>("kugelblitz");
   add_factory<LiveFire>("livefire");
   add_factory<LiveFireAsleep>("livefire_asleep");
@@ -265,6 +264,7 @@ ObjectFactory::init_factories()
   add_factory<Spotlight>("spotlight");
   add_factory<Thunderstorm>("thunderstorm");
   add_factory<TileMap>("tilemap");
+  add_factory<Torch>("torch");
   add_factory<Trampoline>("trampoline");
   add_factory<RustyTrampoline>("rustytrampoline");
   add_factory<UnstableTile>("unstable_tile");