-// $Id$
-//
// SuperTux - MovingSprite Base Class
// Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.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.
-#include <config.h>
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#include "object/moving_sprite.hpp"
+#include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "util/reader.hpp"
#include <stdexcept>
-#include "moving_sprite.hpp"
-#include "video/drawing_context.hpp"
-#include "sprite/sprite_manager.hpp"
-#include "player.hpp"
-#include "sector.hpp"
-#include "player_status.hpp"
-#include "gameobjs.hpp"
-#include "statistics.hpp"
-#include "object_factory.hpp"
-#include "level.hpp"
-#include "random_generator.hpp"
-#include "audio/sound_source.hpp"
-#include "audio/sound_manager.hpp"
-#include "timer.hpp"
-
-MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name, int layer, CollisionGroup collision_group)
- : sprite_name(sprite_name), layer(layer)
+MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name_,
+ int layer_, CollisionGroup collision_group) :
+ sprite_name(sprite_name_),
+ sprite(),
+ layer(layer_)
{
bbox.set_pos(pos);
sprite = sprite_manager->create(sprite_name);
set_group(collision_group);
}
-MovingSprite::MovingSprite(const lisp::Lisp& reader, const Vector& pos, int layer, CollisionGroup collision_group)
- : layer(layer)
+MovingSprite::MovingSprite(const Reader& reader, const Vector& pos, int layer_, CollisionGroup collision_group) :
+ sprite_name(),
+ sprite(),
+ layer(layer_)
{
bbox.set_pos(pos);
if (!reader.get("sprite", sprite_name))
set_group(collision_group);
}
-MovingSprite::MovingSprite(const lisp::Lisp& reader, const std::string& sprite_name, int layer, CollisionGroup collision_group)
- : sprite_name(sprite_name), layer(layer)
+MovingSprite::MovingSprite(const Reader& reader, const std::string& sprite_name_, int layer_, CollisionGroup collision_group) :
+ sprite_name(sprite_name_),
+ sprite(),
+ layer(layer_)
{
- if (!reader.get("x", bbox.p1.x))
- throw std::runtime_error("no x position set");
- if (!reader.get("y", bbox.p1.y))
- throw std::runtime_error("no y position set");
+ reader.get("x", bbox.p1.x);
+ reader.get("y", bbox.p1.y);
+ reader.get("sprite", this->sprite_name);
- sprite = sprite_manager->create(sprite_name);
+ sprite = sprite_manager->create(this->sprite_name);
bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
set_group(collision_group);
}
-MovingSprite::MovingSprite(const lisp::Lisp& reader, int layer, CollisionGroup collision_group)
- : layer(layer)
+MovingSprite::MovingSprite(const Reader& reader, int layer_, CollisionGroup collision_group) :
+ sprite_name(),
+ sprite(),
+ layer(layer_)
{
- if (!reader.get("x", bbox.p1.x))
- throw std::runtime_error("no x position set");
- if (!reader.get("y", bbox.p1.y))
- throw std::runtime_error("no y position set");
+ reader.get("x", bbox.p1.x);
+ reader.get("y", bbox.p1.y);
if (!reader.get("sprite", sprite_name))
throw std::runtime_error("no sprite name set");
set_group(collision_group);
}
-MovingSprite::MovingSprite(const MovingSprite& other)
- : MovingObject(other), layer(other.layer)
+MovingSprite::MovingSprite(const MovingSprite& other) :
+ MovingObject(other),
+ sprite_name(),
+ sprite(),
+ layer(other.layer)
{
- sprite = new Sprite(*other.sprite);
+ sprite = other.sprite->clone();
}
-
-MovingSprite&
-MovingSprite::operator=(const MovingSprite& other)
-{
+/*
+ MovingSprite&
+ MovingSprite::operator=(const MovingSprite& other)
+ {
if (this == &other)
- return *this;
+ return *this;
delete sprite;
sprite = new Sprite(*other.sprite);
layer = other.layer;
return *this;
-}
-
+ }
+*/
MovingSprite::~MovingSprite()
{
- delete sprite;
}
void
void
MovingSprite::set_action_centered(const std::string& action, int loops)
{
- Vector old_size = bbox.get_size();
+ Vector old_size = bbox.get_size().as_vector();
sprite->set_action(action, loops);
set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
- set_pos(get_pos() - (bbox.get_size() - old_size) / 2);
+ set_pos(get_pos() - (bbox.get_size().as_vector() - old_size) / 2);
}
void
MovingSprite::set_action(const std::string& action, int loops, AnchorPoint anchorPoint)
{
- Rect old_bbox = bbox;
+ Rectf old_bbox = bbox;
sprite->set_action(action, loops);
float w = sprite->get_current_hitbox_width();
float h = sprite->get_current_hitbox_height();
set_size(w, h);
set_pos(get_anchor_pos(old_bbox, w, h, anchorPoint));
}
+
+/* EOF */
projects / supertux.git / blobdiff