yeti cleanup and death animation rework, hitbox fix ups

[supertux.git] / src / game_object.hpp

diff --git a/src/game_object.hpp b/src/game_object.hpp
index 6e0c4ee..e70b842 100644 (file)
--- a/src/game_object.hpp
+++ b/src/game_object.hpp
@@ -1,7 +1,7 @@
-//  $Id: game_object.h 2293 2005-03-25 20:39:56Z matzebraun $
+//  $Id$
 //
-//  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.de>
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -78,7 +78,9 @@ public:
   // flags
   enum {
     /// the tile so you can stand on it
-    FLAG_SOLID       = 0x0001,
+    FLAG_SOLID       = (1 << 0),
+    /// the object can be carried around (inherits from Portable)
+    FLAG_PORTABLE    = (1 << 1)
   };                     
 
   int get_flags() const