Removed trailing whitespace from all *.?pp files

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

diff --git a/src/object/ispy.cpp b/src/object/ispy.cpp
index 5a7092e..fa9e73e 100644 (file)
--- a/src/object/ispy.cpp
+++ b/src/object/ispy.cpp
@@ -24,9 +24,11 @@
 #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), 
+  MovingSprite(reader, "images/objects/ispy/ispy.sprite", LAYER_TILES+5, COLGROUP_DISABLED),
+  state(ISPYSTATE_IDLE),
   script(),
   dir(AUTO)
 {
@@ -41,7 +43,7 @@ Ispy::Ispy(const Reader& reader) :
   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"));
@@ -65,20 +67,20 @@ Ispy::line_intersects_line(Vector line1_start, Vector line1_end, Vector line2_st
   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);
@@ -91,7 +93,7 @@ Ispy::line_intersects_line(Vector line1_start, Vector line1_end, Vector line2_st
 }
 
 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);
@@ -144,7 +146,7 @@ Ispy::free_line_of_sight(Vector line_start, Vector line_end, const MovingObject*
   return true;
 }
 
-void 
+void
 Ispy::update(float )
 {
 
@@ -197,6 +199,4 @@ Ispy::update(float )
   }
 }
 
-IMPLEMENT_FACTORY(Ispy, "ispy");
-
 /* EOF */