X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.cpp;h=e22f81998bdd8f6afe35dfc723cceb6130f2f441;hb=5c14f6f384eff76491d494b4c157abf2ff776d49;hp=2ff06b83c5d6638abc54ac04968e933fccb23c65;hpb=bb5bf44283e1ca2a3cc306f557cef5dbc8c20a22;p=supertux.git diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp index 2ff06b83c..e22f81998 100644 --- a/src/badguy/dispenser.cpp +++ b/src/badguy/dispenser.cpp @@ -1,11 +1,33 @@ +// $Id$ +// +// SuperTux +// Copyright (C) 2005 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 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, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +// 02111-1307, USA. #include -#include "dispenser.h" -#include "badguy/bouncing_snowball.h" -#include "badguy/snowball.h" -#include "badguy/mrbomb.h" -#include "badguy/mriceblock.h" -#include "badguy/mrrocket.h" +#include "dispenser.hpp" +#include "badguy/bouncing_snowball.hpp" +#include "badguy/snowball.hpp" +#include "badguy/mrbomb.hpp" +#include "badguy/mriceblock.hpp" +#include "badguy/mrrocket.hpp" +#include "badguy/poisonivy.hpp" +#include "badguy/snowsnail.hpp" +#include "badguy/skullyhop.hpp" Dispenser::Dispenser(const lisp::Lisp& reader) { @@ -14,8 +36,12 @@ Dispenser::Dispenser(const lisp::Lisp& reader) reader.get("cycle", cycle); reader.get("badguy", badguy); bbox.set_size(32, 32); - sprite = sprite_manager->create("dispenser"); - sprite->set_action("working"); + sprite = sprite_manager->create("images/creatures/dispenser/dispenser.sprite"); + if (badguy == "mrrocket") { + sprite->set_action(dir == LEFT ? "working-left" : "working-right"); + } + else {sprite->set_action("dropper");} + countMe = false; } void @@ -42,7 +68,7 @@ bool Dispenser::collision_squished(Player& player) { //TODO: Should it act like a normal tile when killed? - sprite->set_action("broken"); + sprite->set_action(dir == LEFT ? "broken-left" : "broken-right"); dispense_timer.start(0); player.bounce(*this); kill_squished(player); @@ -50,7 +76,7 @@ Dispenser::collision_squished(Player& player) } void -Dispenser::active_action(float ) +Dispenser::active_update(float ) { if (dispense_timer.check()) { launch_badguy(); @@ -58,7 +84,8 @@ Dispenser::active_action(float ) } //TODO: Add launching velocity to certain badguys -// Add randomizer (themed to match tileset) +// Add themed randomizer +// Fix initial direction (everyone but MrRocket walks the wrong direction) void Dispenser::launch_badguy() { @@ -69,13 +96,30 @@ Dispenser::launch_badguy() else if (badguy == "bouncingsnowball") Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y+32, dir)); else if (badguy == "mrbomb") - Sector::current()->add_object(new MrBomb(get_pos().x, get_pos().y+32, dir)); + Sector::current()->add_object(new MrBomb(get_pos().x, get_pos().y+32, dir, false)); else if (badguy == "mriceblock") - Sector::current()->add_object(new MrIceBlock(get_pos().x, get_pos().y+32, dir)); - else if (badguy == "mrrocket") - Sector::current()->add_object(new MrRocket(get_pos().x, get_pos().y+32, dir)); + Sector::current()->add_object(new MrIceBlock(get_pos().x, get_pos().y+32, dir, false)); + else if (badguy == "snowsnail") + Sector::current()->add_object(new SnowSnail(get_pos().x, get_pos().y+32, dir)); + else if (badguy == "mrrocket") { + Sector::current()->add_object(new MrRocket(get_pos().x+(dir == LEFT ? -32 : 32), get_pos().y, dir));} + else if (badguy == "poisonivy") + Sector::current()->add_object(new PoisonIvy(get_pos().x, get_pos().y+32, dir)); + else if (badguy == "skullyhop") + Sector::current()->add_object(new SkullyHop(get_pos().x, get_pos().y+44, dir)); else if (badguy == "random") - {} + { + switch (rand()%7) + { + case 0: Sector::current()->add_object(new SnowBall(get_pos().x, get_pos().y+32, dir)); break; + case 1: Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y+32, dir)); break; + case 2: Sector::current()->add_object(new MrBomb(get_pos().x, get_pos().y+32, dir, false)); break; + case 3: Sector::current()->add_object(new MrIceBlock(get_pos().x, get_pos().y+32, dir, false)); break; + case 4: Sector::current()->add_object(new PoisonIvy(get_pos().x, get_pos().y+32, dir)); break; + case 5: Sector::current()->add_object(new SnowSnail(get_pos().x, get_pos().y+32, dir)); break; + case 6: Sector::current()->add_object(new SkullyHop(get_pos().x, get_pos().y+44, dir)); break; + } + } } }