X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Frock.hpp;h=63db7676783a817514eb324ef68be7cab905185f;hb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;hp=46364ba0e9aaad47d4c73477ecc3d8bea3d53ec8;hpb=f406067af6cbeb0a638078fe1d386d092583909c;p=supertux.git

diff --git a/src/object/rock.hpp b/src/object/rock.hpp
index 46364ba0e..63db76767 100644
--- a/src/object/rock.hpp
+++ b/src/object/rock.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,39 +12,39 @@
 //  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 "object/moving_sprite.hpp"
-#include "physic.hpp"
-#include "portable.hpp"
-#include "serializable.hpp"
+#include "object/portable.hpp"
+#include "supertux/physic.hpp"
 
 class Sprite;
 
-class Rock : public MovingSprite, public Portable, protected UsesPhysic, public Serializable
+class Rock : public MovingSprite, 
+             public Portable
 {
 public:
   Rock(const Vector& pos, std::string spritename);
-  Rock(const lisp::Lisp& reader);
-  Rock(const lisp::Lisp& reader, std::string spritename);
-  virtual Rock* clone() const { return new Rock(*this); }
+  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 write(lisp::Writer& writer);
 
   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 */