From 23818014c3841291ba4041d8627b2698478c5d49 Mon Sep 17 00:00:00 2001 From: florianf Date: Fri, 26 Feb 2010 20:49:54 +0000 Subject: [PATCH] Remove Mr. Rocket. Use Kamikaze Snowball instead. git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6408 837edb03-e0f3-0310-88ca-d4d4e8b29345 --- data/images/creatures/mr_rocket/collision.png | Bin 1678 -> 0 bytes data/images/creatures/mr_rocket/flying-0.png | Bin 3412 -> 0 bytes data/images/creatures/mr_rocket/flying-1.png | Bin 3637 -> 0 bytes data/images/creatures/mr_rocket/flying-2.png | Bin 3903 -> 0 bytes data/images/creatures/mr_rocket/mr_rocket.sprite | 40 ------------ data/images/creatures/mr_rocket/squished.png | Bin 1725 -> 0 bytes src/badguy/mrrocket.cpp | 80 ----------------------- src/badguy/mrrocket.hpp | 41 ------------ src/supertux/object_factory.cpp | 2 - 9 files changed, 163 deletions(-) delete mode 100644 data/images/creatures/mr_rocket/collision.png delete mode 100644 data/images/creatures/mr_rocket/flying-0.png delete mode 100644 data/images/creatures/mr_rocket/flying-1.png delete mode 100644 data/images/creatures/mr_rocket/flying-2.png delete mode 100644 data/images/creatures/mr_rocket/mr_rocket.sprite delete mode 100644 data/images/creatures/mr_rocket/squished.png delete mode 100644 src/badguy/mrrocket.cpp delete mode 100644 src/badguy/mrrocket.hpp diff --git a/data/images/creatures/mr_rocket/collision.png b/data/images/creatures/mr_rocket/collision.png deleted file mode 100644 index d326f93daa88353281b77604008ed51183653dc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1678 zcmV;9266d`P)WFU8GbZ8({Xk{QrNlj4iWF>9@00r_%L_t(&-tAU-Ow(r= zCT26nEZaiZ#7&oF;t_PpxYiXYr63gKYH7JapyftTE;$vU912#HBM60{AQC0O62g{c z5uMC2!wgH@{@9T$iCEoLrETl=^-Sy0!mzI{=-Fj!|18m)FF5Izg_cJHZ zqz+Fv+rJFFX}^%5@OgFwjvhU_#>vU)wPB}SAHa4!ub?gQ0B21TI~=)H^pfhvMR52m*4s z9H;&KP$!k5fX=q6N*qxrpeF%kKmc?}NsyAz;=KWlW^{@~gCn(fRzx5(GxKU&TbqTzwQJWb(Z{RR zxJjqi#rM!q#0CbUfuDyD9|p@5&`@6=Hs$Yc9wkZdeS!0Q%(`Vc@9OG$o6Th&9v;U0 z{5(V^!otE(m6C$b6A~~T7l)Xb7!>pDxL%JWW+5XZ<8EVO;>0}{7j%=9GD2mxwY7a~ zSp*6T3v=~+a8FMU+S}WamX>C5Vqz~0=jP%@c{$?a<8dN992ZE0WRaYljGHXc16NlV znJJ}4B}h6ii$HaC^`vOLl9Cb>6%~Oah=T_YVzjOf3$3mAw!R+hd{n3EVdVM#{rizm zVvpDhW{Cub2sIR;A)smoKapcP`#Dvo`;nqES5s3160ulSRh7lApE!ZrwY8Y3tP~H& z5S@>cXjWDhYH5(kELIX54Ox&9d3kw}OLksSRFvKs5rIiI7zM_B=FAyO?S-8>bqbsc zOp%O%rJ2glM`L3n`YS3h$n1!0b!21!98qEVuuynXE7Yp+r4u-tntJv-rtf>2aN673 zYv}=#$%M|%PK%vm)E_a`rosZWvJ`{Ij-kJxz>=jw_6e2AVtV#~G{6s8ndvD@CeW(Y zUcS$!nxzS66d?=_4&vg)i|Fs~M_*qb#)6f=COZuI`=YzM8F zL<#;RaDYL$`}rXIKu+S43FPVZ&38HDvr$nH_2&YzJXna4NVhmMQ3qP}Iy7@6MGuIQ z+~D|$43vT}tee%)X?8D%Pn`n7M%N)N|DM2?NtCYJ80KZjOvZ z3)4G9Au6X9RC5Z>@%s^utC)oQY+x}3z081%T!w()eM=`GKryMI=v1=_O+o`icas3nEQb*br=yIvgqh*U&3_URVSdCW{*XkSy}jV!BM(`Y5HY>ULVPH% z78Ml6cL7w;aS2o0&InWJRH$VIot5xhp-?opm6m?<6A9d;GP-!n7VI``*s&}EBO@bQ z%gV|g3b~DAieqDAE!v+;ooMxtqKCB>=h4y8s7y?RhK)x8FHoHFKUJ&EU-S2Xu+ZQ5 zDBERk!{f(~k8{HzoY4vk<$}@E;Q%8vdCQfk`su%@a_sD{ZnS#@M+Z#Hq+>R# z0poUuKC{CnOiJB`R)qi??v<|XTkefJ?>5=27B<`4J8ZPIeb2@UE3B}>3M;Iz!ip8* Y4|eU3`(n`TM*si-07*qoM6N<$g3T-#ApigX 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 e7274bc7fd58a3e8989e0848d2e49858389b1980..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3412 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 N002ovPDHLkV1npYfYJZ} 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 e6e23061be3ef9fee6696d73b6e25c4a0b449516..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1725 zcmV;u215CXP)WFU8GbZ8({Xk{QrNlj4iWF>9@00tpRL_t(&-tAUvOjCCh zKezPVQi{+^1#~IW|UJayf08nxdOhDYdHAWU*Lo+fyJAkQ8G%$;rej z6#lT&X%gqJb#-+`=3)-*1Ob~z zMrb$~q*%O%@cpYLOUP)o-my2waiq~`NDs26L?ZHMW>O#4L0uFdAJ2ho8#^}Ex6R?$ zly0>$OejQy*sFZ0mahJJgI49_aQ&BicEi7K9|{3wWo5;3x%^|ud?{*}cZyO|QwiCL zWD`;*pYPwME*6XF?X)yX4Fu?n!$En-?g&WuY;cf-LSZCe{+f#nmZh~IXA*%=WoMJY zY$lXeL>>81&B3-d67p*phG&d^*6HZPxSg!y6Qo;_N$IS%wxXh9--1p7$XRK(SoAW7 z<2kM0UlevY#A1fw!V-zX%W*-QKrk~Zmm3g#acpd?La9{VavWqt?mQW4I5?Y0{*vQ4 z6{K{!XK29XqL;9)8NsK4l)3Y6Q-DfELbsciC_w}gBf@K~Ik10Tr(4kvStg@CXXQONi1`|g1|tsfcZ_@Bq!uzCMwUafV|NMoj-WtT zuUJYx1e72Skc|HJ%@0TKwvK=2gK0w(T@J-qVRJ$zBNFHI&TQ5Q0LueJOdiA2IdebY%!r_t{7 zwGI0Hjc9_uoI7{Ub@b>_6$mQPIvo27e7-!b$s`C!Bvkd(a%vwijdnDhU(Iv>Q2zr? zo;%}-p)+VV`1t~`3Iz>uK;iuP)^;fzs9a^+M!J3*H zac^&LI)cu&*=$+(n~OtcGZ2g#H5vy35_qh4PRHXHm{Fo`gQ#U37t}73UziYz>Uw&5 zx-Yc0Uc+{FUJwuBPe(_GV9lB}VR~FpRaGS@DJfy!%1p28O=aETjAV|>&Elq4=W=`Z z?AiaQ{bLr>Sax={=EaczwZdSa07afq9;8D?qjBJ|$yO9mL=i<4QA82NlZ3wjg$7d4 TQ;72N00000NkvXXu0mjfc2^*S 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"); -- 2.11.0