Tentative checkin of tuxdev's "Object improvement patch, part 1"

[supertux.git] / src / game_object.cpp

diff --git a/src/game_object.cpp b/src/game_object.cpp
index 1f75d62..08c0eb1 100644 (file)
--- a/src/game_object.cpp
+++ b/src/game_object.cpp
@@ -22,9 +22,16 @@
 #include "game_object.hpp"
 #include "object_remove_listener.hpp"
 
-GameObject::GameObject()
-  : wants_to_die(false), remove_listeners(0), flags(0)
+
+GameObject::GameObject(std::string name)
+  : wants_to_die(false), remove_listeners(0), name(name)
+{
+}
+
+GameObject::GameObject(const lisp::Lisp& lisp)
+  : wants_to_die(false), remove_listeners(0), name("")
 {
+  lisp.get("name" , name);
 }
 
 GameObject::~GameObject()