restore trunk

[supertux.git] / src / object_factory.cpp

diff --git a/src/object_factory.cpp b/src/object_factory.cpp
index 0b69169..fe89724 100644 (file)
--- a/src/object_factory.cpp
+++ b/src/object_factory.cpp
@@ -25,13 +25,12 @@
 #include "lisp/lisp.hpp"
 #include "lisp/parser.hpp"
 #include "object_factory.hpp"
-
-Factories* object_factories = 0;
+#include "math/vector.hpp"
 
 GameObject* create_object(const std::string& name, const lisp::Lisp& reader)
 {
-  Factories::iterator i = object_factories->find(name);
-  if(i == object_factories->end()) {
+  Factory::Factories::iterator i = Factory::get_factories().find(name);
+  if(i == Factory::get_factories().end()) {
     std::stringstream msg;
     msg << "No factory for object '" << name << "' found.";
     throw std::runtime_error(msg.str());
@@ -48,6 +47,8 @@ GameObject* create_object(const std::string& name, const Vector& pos)
            << " (y " << pos.y << "))";
 
   lisp::Parser parser;
-  std::auto_ptr<lisp::Lisp> lisp (parser.parse(lisptext));
-  return create_object(name, *lisp);
+  const lisp::Lisp* lisp = parser.parse(lisptext, "create_object");
+  GameObject* object = create_object(name, *lisp);
+
+  return object;
 }