Fixed trailing whitespaces in all(?) source files of supertux, also fixed some svn...

[supertux.git] / src / game_object.hpp

diff --git a/src/game_object.hpp b/src/game_object.hpp
index d9541ed..f463f88 100644 (file)
--- a/src/game_object.hpp
+++ b/src/game_object.hpp
@@ -21,6 +21,7 @@
 
 #include <string>
 #include "refcounter.hpp"
+#include "lisp/lisp.hpp"
 
 class DrawingContext;
 class ObjectRemoveListener;
@@ -34,7 +35,6 @@ class ObjectRemoveListener;
  *    draw() functions. Both are called once per frame.
  *  - Providing a safe way to remove the object by calling the remove_me
  *    functions.
- *  - a 32bit bitset for flags...
  */
 class GameObject : public RefCounter
 {
@@ -78,17 +78,9 @@ public:
     remove_listeners = entry;
   }
 
-  // flags
-  enum {
-    /// the tile so you can stand on it
-    FLAG_SOLID       = (1 << 0),
-    /// the object can be carried around (inherits from Portable)
-    FLAG_PORTABLE    = (1 << 1)
-  };
-
-  int get_flags() const
+  const std::string& get_name() const
   {
-    return flags;
+    return name;
   }
 
 private:
@@ -105,7 +97,11 @@ private:
   RemoveListenerListEntry* remove_listeners;
 
 protected:
-  int flags;
+  /**
+   * a name for the gameobject, this is mostly a hint for scripts and for
+   * debugging, don't rely on names being set or being unique
+   */
+  std::string name;
 };
 
 #endif /*SUPERTUX_GAMEOBJECT_H*/