From: florianf Date: Fri, 26 Feb 2010 20:49:54 +0000 (+0000) Subject: Remove Mr. Rocket. X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=23818014c3841291ba4041d8627b2698478c5d49;p=supertux.git Remove Mr. Rocket. Use Kamikaze Snowball instead. git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6408 837edb03-e0f3-0310-88ca-d4d4e8b29345 --- diff --git a/data/images/creatures/mr_rocket/collision.png b/data/images/creatures/mr_rocket/collision.png deleted file mode 100644 index d326f93da..000000000 Binary files a/data/images/creatures/mr_rocket/collision.png and /dev/null differ diff --git a/data/images/creatures/mr_rocket/flying-0.png b/data/images/creatures/mr_rocket/flying-0.png deleted file mode 100644 index e7274bc7f..000000000 Binary files a/data/images/creatures/mr_rocket/flying-0.png and /dev/null differ diff --git a/data/images/creatures/mr_rocket/flying-1.png b/data/images/creatures/mr_rocket/flying-1.png deleted file mode 100644 index 50387953d..000000000 Binary files a/data/images/creatures/mr_rocket/flying-1.png and /dev/null differ diff --git a/data/images/creatures/mr_rocket/flying-2.png b/data/images/creatures/mr_rocket/flying-2.png deleted file mode 100644 index b57ec3268..000000000 Binary files a/data/images/creatures/mr_rocket/flying-2.png and /dev/null differ diff --git a/data/images/creatures/mr_rocket/mr_rocket.sprite b/data/images/creatures/mr_rocket/mr_rocket.sprite deleted file mode 100644 index 0cccf3aaf..000000000 --- a/data/images/creatures/mr_rocket/mr_rocket.sprite +++ /dev/null @@ -1,40 +0,0 @@ -(supertux-sprite - (action - (name "left") - (fps 15.0) - (hitbox 12 21 42 19) - (images "flying-0.png" - "flying-1.png" - "flying-2.png" - "flying-1.png") - ) - - (action - (name "right") - (fps 10.0) - (hitbox 10 21 42 19) - (mirror-action "left") - ) - - (action - (name "squished-left") - (hitbox 12 11 42 19) - (images "squished.png") - ) - - (action - (name "squished-right") - (hitbox 10 0 42 19) - (mirror-action "squished-left")) - - (action - (name "collision-left") - (hitbox 6 21 42 19) - (images "collision.png")) - - (action - (name "collision-right") - (hitbox 9 21 42 19) - (mirror-action "squished-left") - ) -) diff --git a/data/images/creatures/mr_rocket/squished.png b/data/images/creatures/mr_rocket/squished.png deleted file mode 100644 index e6e23061b..000000000 Binary files a/data/images/creatures/mr_rocket/squished.png and /dev/null differ diff --git a/src/badguy/mrrocket.cpp b/src/badguy/mrrocket.cpp deleted file mode 100644 index 02fea0ce9..000000000 --- a/src/badguy/mrrocket.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// 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 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 -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// 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, see . - -#include "badguy/mrrocket.hpp" - -#include "object/explosion.hpp" -#include "sprite/sprite.hpp" -#include "supertux/object_factory.hpp" -#include "supertux/sector.hpp" - -static const float SPEED = 200; - -MrRocket::MrRocket(const Reader& reader) : - BadGuy(reader, "images/creatures/mr_rocket/mr_rocket.sprite"), - collision_timer() -{ -} - -MrRocket::MrRocket(const Vector& pos, Direction d) : - BadGuy(pos, d, "images/creatures/mr_rocket/mr_rocket.sprite"), - collision_timer() -{ -} - -void -MrRocket::initialize() -{ - physic.set_velocity_x(dir == LEFT ? -SPEED : SPEED); - physic.enable_gravity(false); - sprite->set_action(dir == LEFT ? "left" : "right"); -} - -void -MrRocket::active_update(float elapsed_time) -{ - if (collision_timer.check()) { - Sector::current()->add_object(new Explosion(get_bbox().get_middle())); - remove_me(); - } - else if (!collision_timer.started()) { - movement=physic.get_movement(elapsed_time); - sprite->set_action(dir == LEFT ? "left" : "right"); - } -} - -bool -MrRocket::collision_squished(GameObject& object) -{ - sprite->set_action(dir == LEFT ? "squished-left" : "squished-right"); - kill_squished(object); - kill_fall(); - return true; -} - -void -MrRocket::collision_solid(const CollisionHit& hit) -{ - if(hit.top || hit.bottom) { - physic.set_velocity_y(0); - } else if(hit.left || hit.right) { - sprite->set_action(dir == LEFT ? "collision-left" : "collision-right"); - physic.set_velocity_x(0); - collision_timer.start(0.2f, true); - } -} - -/* EOF */ diff --git a/src/badguy/mrrocket.hpp b/src/badguy/mrrocket.hpp deleted file mode 100644 index 19c6b59ad..000000000 --- a/src/badguy/mrrocket.hpp +++ /dev/null @@ -1,41 +0,0 @@ -// 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 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 -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// 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, see . - -#ifndef HEADER_SUPERTUX_BADGUY_MRROCKET_HPP -#define HEADER_SUPERTUX_BADGUY_MRROCKET_HPP - -#include "badguy/badguy.hpp" - -class MrRocket : public BadGuy -{ -public: - MrRocket(const Reader& reader); - MrRocket(const Vector& pos, Direction d); - - void initialize(); - void active_update(float elapsed_time); - void collision_solid(const CollisionHit& hit); - -protected: - bool collision_squished(GameObject& object); - -private: - Timer collision_timer; -}; - -#endif - -/* EOF */ diff --git a/src/supertux/object_factory.cpp b/src/supertux/object_factory.cpp index 4bd205790..669bdf49d 100644 --- a/src/supertux/object_factory.cpp +++ b/src/supertux/object_factory.cpp @@ -44,7 +44,6 @@ #include "badguy/mole_rock.hpp" #include "badguy/mrbomb.hpp" #include "badguy/mriceblock.hpp" -#include "badguy/mrrocket.hpp" #include "badguy/mrtree.hpp" #include "badguy/plant.hpp" #include "badguy/poisonivy.hpp" @@ -191,7 +190,6 @@ ObjectFactory::init_factories() add_factory("mole_rock"); add_factory("mrbomb"); add_factory("mriceblock"); - add_factory("mrrocket"); add_factory("mrtree"); add_factory("plant"); add_factory("poisonivy");