- added check for 'region' symbol

[supertux.git] / src / sector.cpp

diff --git a/src/sector.cpp b/src/sector.cpp
index 7ec7720..125d186 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -67,6 +67,7 @@
 #include "scripting/squirrel_util.hpp"
 #include "script_interface.hpp"
 #include "log.hpp"
+#include "main.hpp"
 
 Sector* Sector::_current = 0;
 
@@ -75,7 +76,7 @@ bool Sector::draw_solids_only = false;
 
 Sector::Sector(Level* parent)
   : level(parent), currentmusic(LEVEL_MUSIC),
-  ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), gravity(10.0), player(0), camera(0) 
+  ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), gravity(10.0), player(0), camera(0)
 {
   add_object(new Player(player_status, "Tux"));
   add_object(new DisplayEffect("Effect"));
@@ -227,7 +228,7 @@ Sector::parse_old_format(const lisp::Lisp& reader)
   reader.get("gravity", gravity);
 
   std::string backgroundimage;
-  if (reader.get("background", backgroundimage)) {
+  if (reader.get("background", backgroundimage) && (backgroundimage != "")) {
     if (backgroundimage == "arctis.png") backgroundimage = "arctis.jpg";
     if (backgroundimage == "arctis2.jpg") backgroundimage = "arctis.jpg";
     if (backgroundimage == "ocean.png") backgroundimage = "ocean.jpg";
@@ -325,9 +326,9 @@ Sector::parse_old_format(const lisp::Lisp& reader)
   if(reader.get_vector("foreground-tm", tiles)) {
     TileMap* tilemap = new TileMap();
     tilemap->set(width, height, tiles, LAYER_FOREGROUNDTILES, false);
-    
+
     // fill additional space in foreground with tiles of ID 2035 (lightmap/black)
-    if (height < 19) tilemap->resize(width, 19, 2035); 
+    if (height < 19) tilemap->resize(width, 19, 2035);
 
     add_object(tilemap);
   }
@@ -422,16 +423,16 @@ Sector::fix_old_tiles()
        // torch
        if (tile->getID() == 1517) {
          float pseudo_rnd = (float)((int)pos.x % 10) / 10;
-         add_object(new PulsingLight(center, 1.0 + pseudo_rnd, 0.9, 1.0, Color(1.0, 1.0, 0.6, 1.0)));
+         add_object(new PulsingLight(center, 1.0f + pseudo_rnd, 0.9f, 1.0f, Color(1.0f, 1.0f, 0.6f, 1.0f)));
        }
        // lava or lavaflow
        if ((tile->getID() == 173) || (tile->getID() == 1700) || (tile->getID() == 1705) || (tile->getID() == 1706)) {
          // space lights a bit
-         if (((tm->get_tile(x-1, y)->getID() != tm->get_tile(x,y)->getID()) 
-             && (tm->get_tile(x, y-1)->getID() != tm->get_tile(x,y)->getID())) 
+         if (((tm->get_tile(x-1, y)->getID() != tm->get_tile(x,y)->getID())
+             && (tm->get_tile(x, y-1)->getID() != tm->get_tile(x,y)->getID()))
              || ((x % 3 == 0) && (y % 3 == 0))) {
            float pseudo_rnd = (float)((int)pos.x % 10) / 10;
-           add_object(new PulsingLight(center, 1.0 + pseudo_rnd, 0.8, 1.0, Color(1.0, 0.3, 0.0, 1.0)));
+           add_object(new PulsingLight(center, 1.0f + pseudo_rnd, 0.8f, 1.0f, Color(1.0f, 0.3f, 0.0f, 1.0f)));
          }
        }
 
@@ -589,7 +590,7 @@ Sector::activate(const Vector& player_pos)
     npos.y-=32;
     player->move(npos);
   }
-  
+
   camera->reset(player->get_pos());
   update_game_objects();
 
@@ -630,7 +631,7 @@ Sector::get_active_region()
 {
   return Rect(
     camera->get_translation() - Vector(1600, 1200),
-    camera->get_translation() + Vector(1600, 1200));
+    camera->get_translation() + Vector(1600, 1200) + Vector(SCREEN_WIDTH,SCREEN_HEIGHT));
 }
 
 void
@@ -778,7 +779,7 @@ Sector::before_object_remove(GameObject* object)
     moving_objects.erase(
         std::find(moving_objects.begin(), moving_objects.end(), moving_object));
   }
-          
+
   if(_current == this)
     try_unexpose(object);
 }
@@ -837,7 +838,7 @@ Sector::draw(DrawingContext& context)
   }
 
   if(show_collrects) {
-    Color col(0.2, 0.2, 0.2, 0.7);
+    Color col(0.2f, 0.2f, 0.2f, 0.7f);
     for(MovingObjects::iterator i = moving_objects.begin();
             i != moving_objects.end(); ++i) {
       MovingObject* object = *i;
@@ -921,7 +922,7 @@ void check_collisions(collision::Constraints* constraints,
   }
 }
 
-static const float DELTA = .001;
+static const float DELTA = .001f;
 
 void
 Sector::collision_tilemap(collision::Constraints* constraints,
@@ -1183,6 +1184,10 @@ Sector::collision_static_constrains(MovingObject& object)
   }
 }
 
+namespace {
+  const float MAX_SPEED = 16.0f;
+}
+
 void
 Sector::handle_collisions()
 {
@@ -1192,6 +1197,13 @@ Sector::handle_collisions()
   for(MovingObjects::iterator i = moving_objects.begin();
       i != moving_objects.end(); ++i) {
     MovingObject* moving_object = *i;
+    Vector mov = moving_object->get_movement();
+
+    // make sure movement is never faster than MAX_SPEED. Norm is pretty fat, so two addl. checks are done before.
+    if (((mov.x > MAX_SPEED * M_SQRT1_2) || (mov.y > MAX_SPEED * M_SQRT1_2)) && (mov.norm() > MAX_SPEED)) {
+      moving_object->movement = mov.unit() * MAX_SPEED;
+      //log_debug << "Temporarily reduced object's speed of " << mov.norm() << " to " << moving_object->movement.norm() << "." << std::endl;
+    }
 
     moving_object->dest = moving_object->get_bbox();
     moving_object->dest.move(moving_object->get_movement());
@@ -1287,7 +1299,7 @@ Sector::handle_collisions()
 }
 
 bool
-Sector::is_free_of_tiles(const Rect& rect) const
+Sector::is_free_of_tiles(const Rect& rect, const bool ignoreUnisolid) const
 {
   using namespace collision;
 
@@ -1312,7 +1324,8 @@ Sector::is_free_of_tiles(const Rect& rect) const
          Constraints constraints;
          return collision::rectangle_aatriangle(&constraints, rect, triangle);
        }
-       if(tile->getAttributes() & Tile::SOLID) return false;
+       if((tile->getAttributes() & Tile::SOLID) && !ignoreUnisolid) return false;
+       if((tile->getAttributes() & Tile::SOLID) && !(tile->getAttributes() & Tile::UNISOLID)) return false;
       }
     }
   }
@@ -1321,11 +1334,11 @@ Sector::is_free_of_tiles(const Rect& rect) const
 }
 
 bool
-Sector::is_free_of_statics(const Rect& rect, const MovingObject* ignore_object) const
+Sector::is_free_of_statics(const Rect& rect, const MovingObject* ignore_object, const bool ignoreUnisolid) const
 {
   using namespace collision;
 
-  if (!is_free_of_tiles(rect)) return false;
+  if (!is_free_of_tiles(rect, ignoreUnisolid)) return false;
 
   for(MovingObjects::const_iterator i = moving_objects.begin();
       i != moving_objects.end(); ++i) {
@@ -1352,7 +1365,7 @@ Sector::is_free_of_movingstatics(const Rect& rect, const MovingObject* ignore_ob
     const MovingObject* moving_object = *i;
     if (moving_object == ignore_object) continue;
     if (!moving_object->is_valid()) continue;
-    if ((moving_object->get_group() == COLGROUP_MOVING) 
+    if ((moving_object->get_group() == COLGROUP_MOVING)
       || (moving_object->get_group() == COLGROUP_MOVING_STATIC)
       || (moving_object->get_group() == COLGROUP_STATIC)) {
       if(intersects(rect, moving_object->get_bbox())) return false;