Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / object / portable.hpp

diff --git a/src/object/portable.hpp b/src/object/portable.hpp
index d3a2aef..5fbabf4 100644 (file)
--- a/src/object/portable.hpp
+++ b/src/object/portable.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,15 +12,14 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __PORTABLE_H__
-#define __PORTABLE_H__
+#ifndef HEADER_SUPERTUX_OBJECT_PORTABLE_HPP
+#define HEADER_SUPERTUX_OBJECT_PORTABLE_HPP
 
-#include "moving_object.hpp"
-#include "direction.hpp"
-#include "refcounter.hpp"
+#include "supertux/direction.hpp"
+#include "supertux/moving_object.hpp"
+#include "util/refcounter.hpp"
 
 /**
  * An object that inherits from this object is considered "portable" and can
@@ -33,10 +30,6 @@
 class Portable
 {
 public:
-  Portable(bool portable = false) :
-    portable(portable)
-  {
-  }
   virtual ~Portable()
   { }
 
@@ -48,20 +41,12 @@ public:
   virtual void ungrab(MovingObject& , Direction )
   {}
 
-  // --- BEGIN METHODS TO EXPOSE TO SQUIRREL --- //
-  void set_portable(bool portable)
-  {
-    this->portable = portable;
-  }
-
-  bool is_portable() const
+  virtual bool is_portable() const
   {
-    return portable;
+    return true;
   }
-  // --- END METHODS TO EXPOSE TO SQUIRREL --- //
-
-private:
-  bool portable; /**< true if this object can currently be carried */
 };
 
 #endif
+
+/* EOF */