X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fsspiky.cpp;h=8bef20056834ab9f7059de331d46e17a7d411d2d;hb=24f7e80ec9620e72efe9f804f6f5dcfdb44f2dea;hp=ad80b8de83f21171dcb4feec44026707f9e9c533;hpb=fea3446f05e1e7673607b835c269d3e8d1929ab3;p=supertux.git diff --git a/src/badguy/sspiky.cpp b/src/badguy/sspiky.cpp index ad80b8de8..8bef20056 100644 --- a/src/badguy/sspiky.cpp +++ b/src/badguy/sspiky.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,32 +12,25 @@ // 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 "badguy/sspiky.hpp" -#include "sspiky.hpp" +#include "object/player.hpp" +#include "sprite/sprite.hpp" +#include "supertux/object_factory.hpp" static const float WALKSPEED = 80; -SSpiky::SSpiky(const lisp::Lisp& reader) - : WalkingBadguy(reader, "images/creatures/spiky/sleepingspiky.sprite", "left", "right"), state(SSPIKY_SLEEPING) +SSpiky::SSpiky(const Reader& reader) + : WalkingBadguy(reader, "images/creatures/spiky/sleepingspiky.sprite", "left", "right"), state(SSPIKY_SLEEPING) { walk_speed = WALKSPEED; max_drop_height = -1; } void -SSpiky::write(lisp::Writer& writer) -{ - writer.start_list("sspiky"); - WalkingBadguy::write(writer); - writer.end_list("sspiky"); -} - -void -SSpiky::activate() +SSpiky::initialize() { state = SSPIKY_SLEEPING; physic.set_velocity_x(0); @@ -77,8 +68,8 @@ SSpiky::active_update(float elapsed_time) { Player* player = this->get_nearest_player(); if (player) { - Rect mb = this->get_bbox(); - Rect pb = player->get_bbox(); + Rectf mb = this->get_bbox(); + Rectf pb = player->get_bbox(); bool inReach_left = (pb.p2.x >= mb.p2.x-((dir == LEFT) ? 256 : 0)); bool inReach_right = (pb.p1.x <= mb.p1.x+((dir == RIGHT) ? 256 : 0)); @@ -99,7 +90,7 @@ SSpiky::active_update(float elapsed_time) { if(sprite->animation_done()) { // start walking state = SSPIKY_WALKING; - WalkingBadguy::activate(); + WalkingBadguy::initialize(); } BadGuy::active_update(elapsed_time); @@ -120,4 +111,4 @@ SSpiky::is_freezable() const return true; } -IMPLEMENT_FACTORY(SSpiky, "sspiky") +/* EOF */