X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Finvisible_wall.cpp;h=beb41a9a2a5f032e9a066a732e15c040b89035cc;hb=78ac7aef674f518549f96160c6354b589553f952;hp=4416b23aa3297830b973bfa996cd2813838cc107;hpb=fea3446f05e1e7673607b835c269d3e8d1929ab3;p=supertux.git diff --git a/src/object/invisible_wall.cpp b/src/object/invisible_wall.cpp index 4416b23aa..beb41a9a2 100644 --- a/src/object/invisible_wall.cpp +++ b/src/object/invisible_wall.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux // Copyright (C) 2006 Matthias Braun // -// 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,22 +12,22 @@ // 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 . -#include +#include "object/invisible_wall.hpp" -#include "invisible_wall.hpp" -#include "lisp/lisp.hpp" -#include "object_factory.hpp" -#include "sprite/sprite.hpp" +#include "supertux/object_factory.hpp" +#include "util/reader.hpp" -InvisibleWall::InvisibleWall(const lisp::Lisp& lisp) - : MovingSprite(lisp, "images/objects/invisible/invisible.sprite", LAYER_TILES, COLGROUP_STATIC), width(32), height(32) +InvisibleWall::InvisibleWall(const Reader& lisp) : + MovingSprite(lisp, "images/objects/invisible/invisible.sprite", LAYER_TILES, COLGROUP_STATIC), + physic(), + width(32), + height(32) { - lisp.get("width", width); - lisp.get("height", height); - bbox.set_size(width, height); + lisp.get("width", width); + lisp.get("height", height); + bbox.set_size(width, height); } HitResponse @@ -39,3 +37,5 @@ InvisibleWall::collision(GameObject& , const CollisionHit& ) } IMPLEMENT_FACTORY(InvisibleWall, "invisible_wall"); + +/* EOF */