Klaus Denker's widescreen_fixes.patch:

[supertux.git] / src / sector.cpp

diff --git a/src/sector.cpp b/src/sector.cpp
index c141f26..c70d606 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -28,6 +28,7 @@
 #include <float.h>
 #include <math.h>
 #include <limits>
+#include <physfs.h>
 
 #include "sector.hpp"
 #include "object/player.hpp"
@@ -55,6 +56,8 @@
 #include "object/coin.hpp"
 #include "object/block.hpp"
 #include "object/invisible_block.hpp"
+#include "object/light.hpp"
+#include "object/pulsing_light.hpp"
 #include "object/bullet.hpp"
 #include "object/text_object.hpp"
 #include "object/portable.hpp"
@@ -64,6 +67,7 @@
 #include "scripting/squirrel_util.hpp"
 #include "script_interface.hpp"
 #include "log.hpp"
+#include "main.hpp"
 
 Sector* Sector::_current = 0;
 
@@ -72,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), 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"));
@@ -224,7 +228,17 @@ Sector::parse_old_format(const lisp::Lisp& reader)
   reader.get("gravity", gravity);
 
   std::string backgroundimage;
-  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";
+    backgroundimage = "images/background/" + backgroundimage;
+    if (!PHYSFS_exists(backgroundimage.c_str())) {
+      log_warning << "Background image \"" << backgroundimage << "\" not found. Ignoring." << std::endl;
+      backgroundimage = "";
+    }
+  }
+
   float bgspeed = .5;
   reader.get("bkgd_speed", bgspeed);
   bgspeed /= 100;
@@ -247,8 +261,7 @@ Sector::parse_old_format(const lisp::Lisp& reader)
 
   if(backgroundimage != "") {
     Background* background = new Background();
-    background->set_image(
-            std::string("images/background/") + backgroundimage, bgspeed);
+    background->set_image(backgroundimage, bgspeed);
     add_object(background);
   } else {
     Gradient* gradient = new Gradient();
@@ -275,7 +288,10 @@ Sector::parse_old_format(const lisp::Lisp& reader)
   spawnpoints.push_back(spawn);
 
   music = "chipdisko.ogg";
+  // skip reading music filename. It's all .ogg now, anyway
+  /*
   reader.get("music", music);
+  */
   music = "music/" + music;
 
   int width = 30, height = 15;
@@ -287,18 +303,33 @@ Sector::parse_old_format(const lisp::Lisp& reader)
       || reader.get_vector("tilemap", tiles)) {
     TileMap* tilemap = new TileMap();
     tilemap->set(width, height, tiles, LAYER_TILES, true);
+
+    // replace tile id 112 (old invisible tile) with 1311 (new invisible tile)
+    for(size_t x=0; x < tilemap->get_width(); ++x) {
+      for(size_t y=0; y < tilemap->get_height(); ++y) {
+        const Tile* tile = tilemap->get_tile(x, y);
+        if(tile->getID() == 112) tilemap->change(x, y, 1311);
+      }
+    }
+
+    if (height < 19) tilemap->resize(width, 19);
     add_object(tilemap);
   }
 
   if(reader.get_vector("background-tm", tiles)) {
     TileMap* tilemap = new TileMap();
     tilemap->set(width, height, tiles, LAYER_BACKGROUNDTILES, false);
+    if (height < 19) tilemap->resize(width, 19);
     add_object(tilemap);
   }
 
   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); 
+
     add_object(tilemap);
   }
 
@@ -378,6 +409,38 @@ Sector::fix_old_tiles()
       }
     }
   }
+
+  // add lights for special tiles
+  for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); i++) {
+    TileMap* tm = dynamic_cast<TileMap*>(*i);
+    if (!tm) continue;
+    for(size_t x=0; x < tm->get_width(); ++x) {
+      for(size_t y=0; y < tm->get_height(); ++y) {
+       const Tile* tile = tm->get_tile(x, y);
+       Vector pos(tm->get_x_offset() + x*32, tm->get_y_offset() + y*32);
+       Vector center(pos.x + 16, pos.y + 16);
+
+       // 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)));
+       }
+       // 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())) 
+             || ((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)));
+         }
+       }
+
+      }
+    }
+  }
+
+
 }
 
 void
@@ -568,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
@@ -664,6 +727,13 @@ Sector::before_object_add(GameObject* object)
     this->player = player;
   }
 
+  UsesPhysic *physic_object = dynamic_cast<UsesPhysic *>(object);
+  if(physic_object)
+  {
+    physic_object->physic.set_gravity(gravity);
+  }
+
+
   if(_current == this) {
     try_expose(object);
   }