projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed a few things from svn:ignore that are no longer needed to to switch to Cmake
[supertux.git]
/
src
/
object_factory.cpp
diff --git
a/src/object_factory.cpp
b/src/object_factory.cpp
index
4e40fd6
..
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"
#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)
{
GameObject* create_object(const std::string& name, const lisp::Lisp& reader)
{
- Factor
ies::iterator i = object_factories->
find(name);
- if(i ==
object_factories->
end()) {
+ Factor
y::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());
std::stringstream msg;
msg << "No factory for object '" << name << "' found.";
throw std::runtime_error(msg.str());