Remove bogus assert

[supertux.git] / src / supertux / tile.cpp

diff --git a/src/supertux/tile.cpp b/src/supertux/tile.cpp
index 61a2e06..87550ad 100644 (file)
--- a/src/supertux/tile.cpp
+++ b/src/supertux/tile.cpp
@@ -37,14 +37,14 @@ Tile::Tile() :
 }
 
 Tile::Tile(const std::vector<ImageSpec>& imagespecs_, const std::vector<ImageSpec>& editor_imagespecs_,
-           uint32_t attributes, uint32_t data, float fps) :
+           uint32_t attributes_, uint32_t data_, float fps_) :
   imagespecs(imagespecs_),
   images(),
   editor_imagespecs(editor_imagespecs_),
   editor_images(),
-  attributes(attributes),
-  data(data),
-  fps(fps)
+  attributes(attributes_),
+  data(data_),
+  fps(fps_)
 {
   correct_attributes();
 }
@@ -154,7 +154,7 @@ Tile::print_debug(int id) const
  * in quotation marks because because the slope's gradient is taken.
  * Also, this uses the movement relative to the tilemaps own movement
  * (if any).  --octo */
-bool Tile::check_movement_unisolid (const Vector movement) const
+bool Tile::check_movement_unisolid (const Vector& movement) const
 {
   int slope_info;
   double mv_x;
@@ -242,7 +242,6 @@ bool Tile::check_movement_unisolid (const Vector movement) const
     return (mv_tan >= slope_tan);
   }
 
-  assert (1 != 1);
   return false;
 } /* int check_movement_unisolid */