X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbadguy%2Fdispenser.cpp;h=1f48673bdb89c57866f7b9f31ce61243935721c8;hb=dfaf28adf2756d68091c7e54ab16fcb174dfcc5c;hp=d7c7b4eaf0d68a795f9dfb57f3f872caae82fb2e;hpb=1a36ad149a4ee89a601d523878d168ed3b68ae62;p=supertux.git diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp index d7c7b4eaf..1f48673bd 100644 --- a/src/badguy/dispenser.cpp +++ b/src/badguy/dispenser.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,36 @@ // 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/dispenser.hpp" -#include "dispenser.hpp" +#include "audio/sound_manager.hpp" +#include "math/random_generator.hpp" #include "object/bullet.hpp" -#include "random_generator.hpp" +#include "object/player.hpp" +#include "supertux/object_factory.hpp" +#include "supertux/sector.hpp" +#include "util/reader.hpp" + +#include -Dispenser::Dispenser(const lisp::Lisp& reader) - : BadGuy(reader, "images/creatures/dispenser/dispenser.sprite") +Dispenser::Dispenser(const Reader& reader) : + BadGuy(reader, "images/creatures/dispenser/dispenser.sprite"), + cycle(), + badguys(), + next_badguy(), + dispense_timer(), + autotarget(), + swivel(), + broken(), + random(), + type() { set_colgroup_active(COLGROUP_MOVING_STATIC); - sound_manager->preload("sounds/squish.wav"); + SoundManager::current()->preload("sounds/squish.wav"); reader.get("cycle", cycle); - reader.get_vector("badguy", badguys); + reader.get("badguy", badguys); random = false; // default reader.get("random", random); type = "dropper"; //default @@ -42,7 +54,7 @@ Dispenser::Dispenser(const lisp::Lisp& reader) if (badguys.size() <= 0) throw std::runtime_error("No badguys in dispenser."); - if (type == "rocket-launcher") { + if (type == "rocketlauncher") { sprite->set_action(dir == LEFT ? "working-left" : "working-right"); set_colgroup_active(COLGROUP_MOVING); //if this were COLGROUP_MOVING_STATIC MrRocket would explode on launch. @@ -60,41 +72,26 @@ Dispenser::Dispenser(const lisp::Lisp& reader) } void -Dispenser::write(lisp::Writer& writer) -{ - writer.start_list("dispenser"); - - writer.write_float("x", start_position.x); - writer.write_float("y", start_position.y); - writer.write_float("cycle", cycle); - writer.write_bool("random", random); - writer.write_string("type", type); - writer.write_string_vector("badguy", badguys); - - writer.end_list("dispenser"); -} - -void Dispenser::activate() { - if( broken ){ - return; - } - if( autotarget && !swivel ){ // auto cannon sprite might be wrong - Player* player = this->get_nearest_player(); - if( player ){ - dir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT; - sprite->set_action(dir == LEFT ? "working-left" : "working-right"); - } - } - dispense_timer.start(cycle, true); - launch_badguy(); + if( broken ){ + return; + } + if( autotarget && !swivel ){ // auto cannon sprite might be wrong + Player* player = this->get_nearest_player(); + if( player ){ + dir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT; + sprite->set_action(dir == LEFT ? "working-left" : "working-right"); + } + } + dispense_timer.start(cycle, true); + launch_badguy(); } void Dispenser::deactivate() { - dispense_timer.stop(); + dispense_timer.stop(); } //TODO: Add launching velocity to certain badguys @@ -102,8 +99,8 @@ bool Dispenser::collision_squished(GameObject& object) { //Cannon launching MrRocket can be broken by jumping on it - //other dispencers are not that fragile. - if (broken || type != "rocket-launcher") { + //other dispensers are not that fragile. + if (broken || type != "rocketlauncher") { return false; } @@ -114,7 +111,7 @@ Dispenser::collision_squished(GameObject& object) if (player){ player->bounce(*this); } - sound_manager->play("sounds/squish.wav", get_pos()); + SoundManager::current()->play("sounds/squish.wav", get_pos()); broken = true; return true; } @@ -143,13 +140,12 @@ Dispenser::collision(GameObject& other, const CollisionHit& hit) return FORCE_MOVE; } - void Dispenser::active_update(float ) { if (dispense_timer.check()) { // auto always shoots in Tux's direction - if( autotarget ){ + if( autotarget ){ if( sprite->animation_done()) { sprite->set_action(dir == LEFT ? "working-left" : "working-right"); swivel = false; @@ -158,7 +154,7 @@ Dispenser::active_update(float ) Player* player = this->get_nearest_player(); if( player && !swivel ){ Direction targetdir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT; - if( dir != targetdir ){ // no target: swivel cannon + if( dir != targetdir ){ // no target: swivel cannon swivel = true; dir = targetdir; sprite->set_action(dir == LEFT ? "swivel-left" : "swivel-right", 1); @@ -182,12 +178,12 @@ Dispenser::launch_badguy() Player* player = this->get_nearest_player(); if( player ){ launchdir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT; - } - } + } + } if (badguys.size() > 1) { if (random) { - next_badguy = systemRandom.rand(badguys.size()); + next_badguy = gameRandom.rand(badguys.size()); } else { next_badguy++; @@ -198,17 +194,56 @@ Dispenser::launch_badguy() } std::string badguy = badguys[next_badguy]; - GameObject* badguy_object = NULL; - if (type == "dropper") - badguy_object = create_badguy_object(badguy, Vector(get_pos().x, get_pos().y+32), launchdir); - else if (type == "cannon") - badguy_object = create_badguy_object(badguy, Vector(get_pos().x + (launchdir == LEFT ? -32 : 32), get_pos().y), launchdir); - else if (type == "rocket-launcher") - badguy_object = create_badguy_object(badguy, Vector(get_pos().x + (launchdir == LEFT ? -32 : 32), get_pos().y), launchdir); + if(badguy == "random") { + log_warning << "random is outdated; use a list of badguys to select from." << std::endl; + return; + } + if(badguy == "goldbomb") { + log_warning << "goldbomb is not allowed to be dispensed" << std::endl; + return; + } + + try { + GameObjectPtr game_object; + Vector spawnpoint; + Rectf object_bbox; + + /* Need to allocate the badguy first to figure out its bounding box. */ + game_object = ObjectFactory::instance().create(badguy, get_pos(), launchdir); + if (game_object == NULL) + throw std::runtime_error("Creating " + badguy + " object failed."); + + BadGuy& bad_guy = dynamic_cast(*game_object); - if (badguy_object) - Sector::current()->add_object(badguy_object); + object_bbox = bad_guy.get_bbox(); + + if (type == "dropper") + { + spawnpoint = get_anchor_pos (get_bbox(), ANCHOR_BOTTOM); + spawnpoint.x -= 0.5 * object_bbox.get_width(); + } + else if ((type == "cannon") || (type == "rocketlauncher")) + { + spawnpoint = get_pos(); /* top-left corner of the cannon */ + if (launchdir == LEFT) + spawnpoint.x -= object_bbox.get_width() + 1; + else + spawnpoint.x += get_bbox().get_width() + 1; + } + + /* Now we set the real spawn position */ + bad_guy.set_pos(spawnpoint); + + /* We don't want to count dispensed badguys in level stats */ + if(bad_guy.countMe) + bad_guy.countMe = false; + + Sector::current()->add_object(game_object); + } catch(const std::exception& e) { + log_warning << "Error dispensing badguy: " << e.what() << std::endl; + return; + } } } @@ -231,4 +266,5 @@ Dispenser::is_freezable() const { return true; } -IMPLEMENT_FACTORY(Dispenser, "dispenser") + +/* EOF */