From fa4ff5c57bd0ddaced216e714e266a2419c777d3 Mon Sep 17 00:00:00 2001 From: Max Teufel Date: Sun, 5 Jun 2016 15:54:51 +0200 Subject: [PATCH] InvisibleWall: inherit from MovingObject, remove unnecessary code (#433) --- src/object/invisible_wall.cpp | 19 ++++++++++++++----- src/object/invisible_wall.hpp | 11 +++++------ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/object/invisible_wall.cpp b/src/object/invisible_wall.cpp index ee78bcb4273..7bcab7dae00 100644 --- a/src/object/invisible_wall.cpp +++ b/src/object/invisible_wall.cpp @@ -19,14 +19,13 @@ #include "supertux/object_factory.hpp" #include "util/reader_mapping.hpp" -InvisibleWall::InvisibleWall(const ReaderMapping& lisp) : - MovingSprite(lisp, "images/objects/invisible/invisible.sprite", LAYER_TILES, COLGROUP_STATIC), - physic(), - width(), - height() +InvisibleWall::InvisibleWall(const ReaderMapping& lisp) { + float width, height; + if (!lisp.get("width", width)) width = 32; if (!lisp.get("height", height)) height = 32; + bbox.set_size(width, height); } @@ -36,4 +35,14 @@ InvisibleWall::collision(GameObject& , const CollisionHit& ) return FORCE_MOVE; } +void +InvisibleWall::draw(DrawingContext& ) +{ +} + +void +InvisibleWall::update(float ) +{ +} + /* EOF */ diff --git a/src/object/invisible_wall.hpp b/src/object/invisible_wall.hpp index 144569f3856..586ada0b449 100644 --- a/src/object/invisible_wall.hpp +++ b/src/object/invisible_wall.hpp @@ -17,20 +17,19 @@ #ifndef HEADER_SUPERTUX_OBJECT_INVISIBLE_WALL_HPP #define HEADER_SUPERTUX_OBJECT_INVISIBLE_WALL_HPP -#include "object/moving_sprite.hpp" -#include "supertux/physic.hpp" +#include "supertux/moving_object.hpp" +#include "util/reader_fwd.hpp" /** A tile that starts falling down if tux stands to long on it */ -class InvisibleWall : public MovingSprite +class InvisibleWall : public MovingObject { public: InvisibleWall(const ReaderMapping& lisp); HitResponse collision(GameObject& other, const CollisionHit& hit); -private: - Physic physic; - float width, height; + void draw(DrawingContext& context); + void update(float elapsed_time); }; #endif