-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
-// 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
// 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 <http://www.gnu.org/licenses/>.
-#include <config.h>
+#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"
-
-Dispenser::Dispenser(const lisp::Lisp& reader)
- : BadGuy(reader, "images/creatures/dispenser/dispenser.sprite")
+#include "object/player.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "util/reader.hpp"
+
+#include <stdexcept>
+
+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");
reader.get("cycle", cycle);
- reader.get_vector("badguy", badguys);
+ reader.get("badguy", badguys);
random = false; // default
reader.get("random", random);
type = "dropper"; //default
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.
}
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
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;
}
return FORCE_MOVE;
}
-
void
Dispenser::active_update(float )
{
}
std::string badguy = badguys[next_badguy];
+
+ if(badguy == "random") {
+ log_warning << "random is outdated; use a list of badguys to select from." << std::endl;
+ return;
+ }
+
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);
+ try {
+ Vector spawnpoint;
+
+ if (type == "dropper")
+ spawnpoint = Vector(get_pos().x, get_pos().y+32);
+ else if (type == "cannon")
+ spawnpoint = Vector(get_pos().x + (launchdir == LEFT ? -32 : 32), get_pos().y);
+ else if (type == "rocketlauncher")
+ spawnpoint = Vector(get_pos().x + (launchdir == LEFT ? -32 : 32), get_pos().y);
- if (badguy_object)
- Sector::current()->add_object(badguy_object);
+ badguy_object = ObjectFactory::instance().create(badguy, spawnpoint, launchdir);
+
+ if (badguy_object)
+ Sector::current()->add_object(badguy_object);
+ } catch(std::exception& e) {
+ log_warning << "Error dispensing badguy: " << e.what() << std::endl;
+ return;
+ }
}
}
{
return true;
}
-IMPLEMENT_FACTORY(Dispenser, "dispenser")
+
+/* EOF */
projects / supertux.git / blobdiff