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

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

diff --git a/src/object/rock.hpp b/src/object/rock.hpp
index 28be0e6..63db767 100644 (file)
--- a/src/object/rock.hpp
+++ b/src/object/rock.hpp
@@ -1,51 +1,50 @@
-//  $Id$
-// 
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  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 __ROCK_H__
-#define __ROCK_H__
+#ifndef HEADER_SUPERTUX_OBJECT_ROCK_HPP
+#define HEADER_SUPERTUX_OBJECT_ROCK_HPP
 
-#include "moving_object.hpp"
-#include "physic.hpp"
-#include "lisp/lisp.hpp"
-#include "portable.hpp"
-#include "serializable.hpp"
+#include "object/moving_sprite.hpp"
+#include "object/portable.hpp"
+#include "supertux/physic.hpp"
 
 class Sprite;
 
-class Rock : public MovingObject, public Portable, public Serializable
+class Rock : public MovingSprite, 
+             public Portable
 {
 public:
-  Rock(const lisp::Lisp& reader);
-  virtual ~Rock();
+  Rock(const Vector& pos, std::string spritename);
+  Rock(const Reader& reader);
+  Rock(const Reader& reader, std::string spritename);
 
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
   void update(float elapsed_time);
-  void draw(DrawingContext& context);
-  void write(lisp::Writer& writer);
-    
-  void grab(MovingObject& object, const Vector& pos);
 
-private:
-  bool grabbed;
-  Sprite* sprite;
+  void grab(MovingObject& object, const Vector& pos, Direction dir);
+  void ungrab(MovingObject& object, Direction dir);
+
+protected:
   Physic physic;
+  bool on_ground;
+  bool grabbed;
+  Vector last_movement;
 };
 
 #endif
+
+/* EOF */