X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject_factory.cpp;h=5335140591183e14d87feeebe271f4d373830c56;hb=dd9fdb809ad6effa216e4483f099a48ab2814352;hp=bd93f21da478a75e1e04276241839fb1fcf860ca;hpb=7bbb0ef907ebec48718560425a0147b31307f7fd;p=supertux.git diff --git a/src/object_factory.cpp b/src/object_factory.cpp index bd93f21da..533514059 100644 --- a/src/object_factory.cpp +++ b/src/object_factory.cpp @@ -1,7 +1,8 @@ // $Id$ // -// SuperTux - A Jump'n Run +// SuperTux // Copyright (C) 2004 Ricardo Cruz +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -21,9 +22,10 @@ #include #include -#include "lisp/lisp.h" -#include "lisp/parser.h" -#include "object_factory.h" +#include "lisp/lisp.hpp" +#include "lisp/parser.hpp" +#include "object_factory.hpp" +#include "math/vector.hpp" Factories* object_factories = 0; @@ -45,8 +47,10 @@ GameObject* create_object(const std::string& name, const Vector& pos) lisptext << "(" << name << " (x " << pos.x << ")" << " (y " << pos.y << "))"; - + lisp::Parser parser; - std::auto_ptr 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; }