-// $Id$
-//
// SuperTux - Ispy
// Copyright (C) 2007 Christoph Sommer <christoph.sommer@2007.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>
-
-#include "ispy.hpp"
-#include "resources.hpp"
-#include "sprite/sprite_manager.hpp"
-#include "video/drawing_context.hpp"
-#include "player.hpp"
-#include "object_factory.hpp"
-#include "game_session.hpp"
-#include "sector.hpp"
-#include "tile.hpp"
-#include "object/tilemap.hpp"
-#include "random_generator.hpp"
-#include "object/sprite_particle.hpp"
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#include "object/ispy.hpp"
-Ispy::Ispy(const lisp::Lisp& reader)
- : MovingSprite(reader, "images/objects/ispy/ispy.sprite", LAYER_TILES+5, COLGROUP_DISABLED), state(ISPYSTATE_IDLE), dir(AUTO)
+#include "object/player.hpp"
+#include "object/tilemap.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "supertux/tile.hpp"
+#include "util/reader.hpp"
+
+#include <sstream>
+
+Ispy::Ispy(const Reader& reader) :
+ MovingSprite(reader, "images/objects/ispy/ispy.sprite", LAYER_TILES+5, COLGROUP_DISABLED),
+ state(ISPYSTATE_IDLE),
+ script(),
+ dir(AUTO)
{
// read script to execute
reader.get("script", script);
if( dir_str == "right" ) dir = RIGHT;
reader.get("facing-down", facing_down);
if (facing_down) dir = DOWN;
- if (dir == AUTO) log_warning << "Setting an Ispy's direction to AUTO is no good idea" << std::endl;
+ if (dir == AUTO) { log_warning << "Setting an Ispy's direction to AUTO is no good idea" << std::endl; }
// set initial sprite action
sprite->set_action((dir == DOWN) ? "idle-down" : ((dir == LEFT) ? "idle-left" : "idle-right"));
}
-void
-Ispy::write(lisp::Writer& writer)
-{
- writer.start_list("ispy");
- writer.write_float("x", bbox.p1.x);
- writer.write_float("y", bbox.p1.y);
- writer.write_string("script", script);
- switch (dir)
- {
- case DOWN:
- writer.write_string("direction", "down"); break;
- case LEFT:
- writer.write_string("direction", "left"); break;
- case RIGHT:
- writer.write_string("direction", "right"); break;
- default: break;
- }
- writer.end_list("ispy");
-}
-
HitResponse
Ispy::collision(GameObject& , const CollisionHit& )
{
float den2 = (d2-b2)*(a1-a2) + (a2-c2)*(b1-b2);
// normalize to positive numerator
- if (num < 0) {
- num =- num;
- den1 =- den1;
- den2 =- den2;
+ if (num < 0) {
+ num = -num;
+ den1 = -den1;
+ den2 = -den2;
}
// numerator is zero -> Check for parallel or coinciding lines
if (num == 0) {
if ((b1-b2)*(c1-a2) != (a1-a2)*(d1-b2)) return false;
- if (a1 == a2) {
- std::swap(a1, b1);
- std::swap(a2, b2);
- std::swap(c1, d1);
- std::swap(c2, d2);
+ if (a1 == a2) {
+ std::swap(a1, b1);
+ std::swap(a2, b2);
+ std::swap(c1, d1);
+ std::swap(c2, d2);
}
if (a1 > a2) std::swap(a1, a2);
if (c1 > c2) std::swap(c1, c2);
}
bool
-Ispy::intersects_line(Rect r, Vector line_start, Vector line_end)
+Ispy::intersects_line(Rectf r, Vector line_start, Vector line_end)
{
Vector p1 = r.p1;
Vector p2 = Vector(r.p2.x, r.p1.y);
std::list<TileMap*> solid_tilemaps = Sector::current()->solid_tilemaps;
for (float test_x = lsx; test_x <= lex; test_x += 16) {
for (float test_y = lsy; test_y <= ley; test_y += 16) {
- for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) {
+ for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); ++i) {
TileMap* solids = *i;
const Tile* tile = solids->get_tile_at(Vector(test_x, test_y));
if(!tile) continue;
if (moving_object == ignore_object) continue;
if (!moving_object->is_valid()) continue;
if ((moving_object->get_group() == COLGROUP_MOVING)
- || (moving_object->get_group() == COLGROUP_MOVING_STATIC)
- || (moving_object->get_group() == COLGROUP_STATIC)) {
+ || (moving_object->get_group() == COLGROUP_MOVING_STATIC)
+ || (moving_object->get_group() == COLGROUP_STATIC)) {
if(intersects_line(moving_object->get_bbox(), line_start, line_end)) return false;
}
}
return true;
}
-void
+void
Ispy::update(float )
{
}
}
-IMPLEMENT_FACTORY(Ispy, "ispy");
-
-
+/* EOF */
projects / supertux.git / blobdiff