Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / object / ispy.cpp

diff --git a/src/object/ispy.cpp b/src/object/ispy.cpp
index 60fbfc9..5a93350 100644 (file)
--- a/src/object/ispy.cpp
+++ b/src/object/ispy.cpp
@@ -1,12 +1,10 @@
-//  $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
@@ -14,26 +12,19 @@
 //  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"
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "object/ispy.hpp"
+
+#include "object/player.hpp"
 #include "object/tilemap.hpp"
-#include "random_generator.hpp"
-#include "object/sprite_particle.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "supertux/tile.hpp"
 
-Ispy::Ispy(const lisp::Lisp& reader)
-       : MovingSprite(reader, "images/objects/ispy/ispy.sprite", LAYER_TILES+5, COLGROUP_DISABLED), state(ISPYSTATE_IDLE), dir(AUTO)
+Ispy::Ispy(const Reader& reader)
+  : MovingSprite(reader, "images/objects/ispy/ispy.sprite", LAYER_TILES+5, COLGROUP_DISABLED), state(ISPYSTATE_IDLE), dir(AUTO)
 {
   // read script to execute
   reader.get("script", script);
@@ -52,16 +43,6 @@ Ispy::Ispy(const lisp::Lisp& reader)
   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.end_list("ispy");
-  // TODO: does not really write out Ispy
-}
-
 HitResponse
 Ispy::collision(GameObject& , const CollisionHit& )
 {
@@ -133,10 +114,10 @@ Ispy::free_line_of_sight(Vector line_start, Vector line_end, const MovingObject*
     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++) {
         TileMap* solids = *i;
-       const Tile* tile = solids->get_tile_at(Vector(test_x, test_y));
-       if(!tile) continue;
+        const Tile* tile = solids->get_tile_at(Vector(test_x, test_y));
+        if(!tile) continue;
         // FIXME: check collision with slope tiles
-       if((tile->getAttributes() & Tile::SOLID)) return false;
+        if((tile->getAttributes() & Tile::SOLID)) return false;
       }
     }
   }
@@ -150,8 +131,8 @@ Ispy::free_line_of_sight(Vector line_start, Vector line_end, const MovingObject*
     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;
     }
   }
@@ -214,4 +195,4 @@ Ispy::update(float )
 
 IMPLEMENT_FACTORY(Ispy, "ispy");
 
-
+/* EOF */