* Comment out resizable flag because it blue-screens on Windows

[supertux.git] / src / object_factory.cpp

diff --git a/src/object_factory.cpp b/src/object_factory.cpp
index 5335140..cc68005 100644 (file)
--- a/src/object_factory.cpp
+++ b/src/object_factory.cpp
@@ -27,12 +27,10 @@
 #include "object_factory.hpp"
 #include "math/vector.hpp"
 
-Factories* object_factories = 0;
-
 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());
@@ -41,16 +39,18 @@ GameObject* create_object(const std::string& name, const lisp::Lisp& reader)
   return i->second->create_object(reader);
 }
 
-GameObject* create_object(const std::string& name, const Vector& pos)
+GameObject* create_object(const std::string& name, const Vector& pos, const Direction dir)
 {
   std::stringstream lisptext;
-  lisptext << "(" << name
-           << " (x " << pos.x << ")"
-           << " (y " << pos.y << "))";
+  lisptext << "((x " << pos.x << ")"
+           << " (y " << pos.y << ")";
+  if(dir != AUTO)
+    lisptext << " (direction " << dir << "))";
 
   lisp::Parser parser;
   const lisp::Lisp* lisp = parser.parse(lisptext, "create_object");
-  GameObject* object = create_object(name, *lisp);
+  GameObject* object = create_object(name, *(lisp->get_car()));
 
   return object;
 }
+