X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fgameobjs.h;h=6b884d737603402e9f3f87382a0a5fb48f349ff2;hb=7a87271678d68514ae2158c0c7adb383d6002872;hp=3d928be0e53d6844cab492242e8a26ed954a5d52;hpb=6f801c22d97251799740317fb1d0caf2e744b321;p=supertux.git

diff --git a/src/object/gameobjs.h b/src/object/gameobjs.h
index 3d928be0e..6b884d737 100644
--- a/src/object/gameobjs.h
+++ b/src/object/gameobjs.h
@@ -18,7 +18,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #ifndef SUPERTUX_GAMEOBJS_H
 #define SUPERTUX_GAMEOBJS_H
 
@@ -29,7 +28,6 @@
 #include "special/game_object.h"
 #include "special/moving_object.h"
 #include "serializable.h"
-#include "utils/lispwriter.h"
 
 /* Bounciness of distros: */
 #define NO_BOUNCE 0
@@ -84,31 +82,6 @@ private:
   Timer2 timer;  
 };
 
-#if 0
-extern Sprite *img_trampoline;
-
-class Trampoline : public MovingObject, public Serializable
-{
-public:
-  Trampoline(LispReader& reader);
-  Trampoline(float x, float y);
- 
-  virtual void write(LispWriter& writer);
-  virtual void action(float frame_ratio);
-  virtual void draw(DrawingContext& context);
-
-  virtual void collision(const MovingObject& other, int);
-  void collision(void *p_c_object, int c_object, CollisionType type);
-
-  Physic physic;
-  enum { M_NORMAL, M_HELD } mode;
-
- private:
-  float power;
-  unsigned int frame;
-};
-#endif
-
 extern Sprite *img_smoke_cloud;
 
 class SmokeCloud : public GameObject