X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Fobject_factory.cpp;h=006060f1061ab92914ae6e95ae5300c939f3dbab;hb=0b18b4aa64ca16a646fa6aa641ecd4d13e60294f;hp=fe6cb0872e97185e06e9f5913977af9f55e9411a;hpb=729bc6717bf68314dc9fad25db3a9f728062263e;p=supertux.git

diff --git a/src/supertux/object_factory.cpp b/src/supertux/object_factory.cpp
index fe6cb0872..006060f10 100644
--- a/src/supertux/object_factory.cpp
+++ b/src/supertux/object_factory.cpp
@@ -26,6 +26,7 @@
 #include "badguy/angrystone.hpp"
 #include "badguy/badguy.hpp"
 #include "badguy/bomb.hpp"
+#include "badguy/skydive.hpp"
 #include "badguy/bouncing_snowball.hpp"
 #include "badguy/captainsnowball.hpp"
 #include "badguy/crystallo.hpp"
@@ -35,24 +36,31 @@
 #include "badguy/fish.hpp"
 #include "badguy/flame.hpp"
 #include "badguy/flyingsnowball.hpp"
+#include "badguy/ghostflame.hpp"
 #include "badguy/ghosttree.hpp"
+#include "badguy/goldbomb.hpp"
+#include "badguy/haywire.hpp"
+#include "badguy/iceflame.hpp"
 #include "badguy/igel.hpp"
 #include "badguy/jumpy.hpp"
 #include "badguy/kamikazesnowball.hpp"
 #include "badguy/kugelblitz.hpp"
+#include "badguy/livefire.hpp"
 #include "badguy/mole.hpp"
 #include "badguy/mole_rock.hpp"
 #include "badguy/mrbomb.hpp"
 #include "badguy/mriceblock.hpp"
-#include "badguy/mrrocket.hpp"
 #include "badguy/mrtree.hpp"
+#include "badguy/owl.hpp"
 #include "badguy/plant.hpp"
 #include "badguy/poisonivy.hpp"
 #include "badguy/root.hpp"
+#include "badguy/short_fuse.hpp"
 #include "badguy/skullyhop.hpp"
 #include "badguy/smartball.hpp"
 #include "badguy/snail.hpp"
 #include "badguy/snowball.hpp"
+#include "badguy/snowman.hpp"
 #include "badguy/spidermite.hpp"
 #include "badguy/spiky.hpp"
 #include "badguy/sspiky.hpp"
@@ -80,8 +88,11 @@
 #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"
+#include "object/coin_rain.hpp"
 #include "object/comet_particle_system.hpp"
 #include "object/decal.hpp"
 #include "object/display_effect.hpp"
@@ -127,6 +138,7 @@
 #include "object/rain_particle_system.hpp"
 #include "object/rainsplash.hpp"
 #include "object/rock.hpp"
+#include "object/rusty_trampoline.hpp"
 #include "object/scripted_object.hpp"
 #include "object/skull_tile.hpp"
 #include "object/smoke_cloud.hpp"
@@ -181,24 +193,35 @@ ObjectFactory::init_factories()
   add_factory<Fish>("fish");
   add_factory<Flame>("flame");
   add_factory<FlyingSnowBall>("flyingsnowball");
+  add_factory<Ghostflame>("ghostflame");
   add_factory<GhostTree>("ghosttree");
+  add_factory<GoldBomb>("goldbomb");
+  add_factory<Haywire>("haywire");
+  add_factory<Iceflame>("iceflame");
   add_factory<Igel>("igel");
   add_factory<Jumpy>("jumpy");
   add_factory<KamikazeSnowball>("kamikazesnowball");
   add_factory<Kugelblitz>("kugelblitz");
+  add_factory<LiveFire>("livefire");
+  add_factory<LiveFireAsleep>("livefire_asleep");
+  add_factory<LiveFireDormant>("livefire_dormant");
   add_factory<Mole>("mole");
   add_factory<MoleRock>("mole_rock");
   add_factory<MrBomb>("mrbomb");
   add_factory<MrIceBlock>("mriceblock");
-  add_factory<MrRocket>("mrrocket");
   add_factory<MrTree>("mrtree");
+  add_factory<Owl>("owl");
   add_factory<Plant>("plant");
   add_factory<PoisonIvy>("poisonivy");
+  add_factory<ShortFuse>("short_fuse");
   add_factory<SSpiky>("sspiky");
+  add_factory<SkyDive>("skydive");
   add_factory<SkullyHop>("skullyhop");
   add_factory<SmartBall>("smartball");
+  add_factory<SmartBlock>("smartblock");
   add_factory<Snail>("snail");
   add_factory<SnowBall>("snowball");
+  add_factory<Snowman>("snowman");
   add_factory<SpiderMite>("spidermite");
   add_factory<Spiky>("spiky");
   add_factory<Stalactite>("stalactite");
@@ -222,6 +245,7 @@ ObjectFactory::init_factories()
   add_factory<Explosion>("explosion");
   add_factory<Firefly>("firefly");
   add_factory<Gradient>("gradient");
+  add_factory<HeavyCoin>("heavycoin");
   add_factory<HurtingPlatform>("hurting_platform");
   add_factory<IceCrusher>("icecrusher");
   add_factory<InfoBlock>("infoblock");
@@ -240,7 +264,9 @@ 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");
   add_factory<WeakBlock>("weak_block");
   add_factory<Wind>("wind");
@@ -254,12 +280,12 @@ ObjectFactory::init_factories()
   add_factory<Switch>("switch");
 }
 
-GameObject*
+GameObjectPtr
 ObjectFactory::create(const std::string& name, const Reader& reader)
 {
   Factories::iterator i = factories.find(name);
 
-  if (i == factories.end()) 
+  if (i == factories.end())
   {
     std::stringstream msg;
     msg << "No factory for object '" << name << "' found.";
@@ -271,7 +297,7 @@ ObjectFactory::create(const std::string& name, const Reader& reader)
   }
 }
 
-GameObject*
+GameObjectPtr
 ObjectFactory::create(const std::string& name, const Vector& pos, const Direction dir)
 {
   std::stringstream lisptext;
@@ -282,9 +308,8 @@ ObjectFactory::create(const std::string& name, const Vector& pos, const Directio
 
   lisp::Parser parser;
   const lisp::Lisp* lisp = parser.parse(lisptext, "create_object");
-  
-  GameObject* object = create(name, *(lisp->get_car()));
-  return object;
+
+  return create(name, *(lisp->get_car()));
 }
 
 /* EOF */