X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.cpp;h=a5fd7d4fb5b5b6e7f6d456dcfa7827494161322c;hb=41b1a29c10b9c5e799d57356eee0d1701c3828b4;hp=88b40cd1b5a4132b71caf7cfc1553797a885a7e6;hpb=b043123f5ece1879b3f884658d002f1d7726f212;p=supertux.git

diff --git a/src/sector.cpp b/src/sector.cpp
index 88b40cd1b..a5fd7d4fb 100644
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -44,6 +44,8 @@
 #include "lisp/writer.hpp"
 #include "lisp/list_iterator.hpp"
 #include "tile.hpp"
+#include "file_system.hpp"
+#include "physfs/physfs_stream.hpp"
 #include "audio/sound_manager.hpp"
 #include "game_session.hpp"
 #include "resources.hpp"
@@ -68,6 +70,7 @@
 #include "script_interface.hpp"
 #include "log.hpp"
 #include "main.hpp"
+#include "level.hpp"
 
 Sector* Sector::_current = 0;
 
@@ -82,6 +85,8 @@ Sector::Sector(Level* parent)
   add_object(new DisplayEffect("Effect"));
   add_object(new TextObject("Text"));
 
+  sound_manager->preload("sounds/shoot.wav");
+
   // create a new squirrel table for the sector
   using namespace Scripting;
 
@@ -313,14 +318,15 @@ Sector::parse_old_format(const lisp::Lisp& reader)
   std::vector<unsigned int> tiles;
   if(reader.get_vector("interactive-tm", tiles)
       || reader.get_vector("tilemap", tiles)) {
-    TileMap* tilemap = new TileMap();
+    TileMap* tilemap = new TileMap(level->get_tileset());
     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);
+        uint32_t id = tilemap->get_tile_id(x, y);
+        if(id == 112)
+          tilemap->change(x, y, 1311);
       }
     }
 
@@ -329,14 +335,14 @@ Sector::parse_old_format(const lisp::Lisp& reader)
   }
 
   if(reader.get_vector("background-tm", tiles)) {
-    TileMap* tilemap = new TileMap();
+    TileMap* tilemap = new TileMap(level->get_tileset());
     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* tilemap = new TileMap(level->get_tileset());
     tilemap->set(width, height, tiles, LAYER_FOREGROUNDTILES, false);
 
     // fill additional space in foreground with tiles of ID 2035 (lightmap/black)
@@ -398,26 +404,27 @@ Sector::fix_old_tiles()
     TileMap* solids = *i;
     for(size_t x=0; x < solids->get_width(); ++x) {
       for(size_t y=0; y < solids->get_height(); ++y) {
-	const Tile* tile = solids->get_tile(x, y);
-	Vector pos(solids->get_x_offset() + x*32, solids->get_y_offset() + y*32);
-
-	if(tile->getID() == 112) {
-	  add_object(new InvisibleBlock(pos));
-	  solids->change(x, y, 0);
-	} else if(tile->getAttributes() & Tile::COIN) {
-	  add_object(new Coin(pos));
-	  solids->change(x, y, 0);
-	} else if(tile->getAttributes() & Tile::FULLBOX) {
-	  add_object(new BonusBlock(pos, tile->getData()));
-	  solids->change(x, y, 0);
-	} else if(tile->getAttributes() & Tile::BRICK) {
-	  add_object(new Brick(pos, tile->getData()));
-	  solids->change(x, y, 0);
-	} else if(tile->getAttributes() & Tile::GOAL) {
-	  std::string sequence = tile->getData() == 0 ? "endsequence" : "stoptux";
-	  add_object(new SequenceTrigger(pos, sequence));
-	  solids->change(x, y, 0);
-	}
+    uint32_t    id   = solids->get_tile_id(x, y);
+    const Tile *tile = solids->get_tile(x, y);
+    Vector pos(solids->get_x_offset() + x*32, solids->get_y_offset() + y*32);
+
+    if(id == 112) {
+      add_object(new InvisibleBlock(pos));
+      solids->change(x, y, 0);
+    } else if(tile->getAttributes() & Tile::COIN) {
+      add_object(new Coin(pos));
+      solids->change(x, y, 0);
+    } else if(tile->getAttributes() & Tile::FULLBOX) {
+      add_object(new BonusBlock(pos, tile->getData()));
+      solids->change(x, y, 0);
+    } else if(tile->getAttributes() & Tile::BRICK) {
+      add_object(new Brick(pos, tile->getData()));
+      solids->change(x, y, 0);
+    } else if(tile->getAttributes() & Tile::GOAL) {
+      std::string sequence = tile->getData() == 0 ? "endsequence" : "stoptux";
+      add_object(new SequenceTrigger(pos, sequence));
+      solids->change(x, y, 0);
+    }
       }
     }
   }
@@ -428,25 +435,25 @@ Sector::fix_old_tiles()
     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.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()))
-	      || ((x % 3 == 0) && (y % 3 == 0))) {
-	    float pseudo_rnd = (float)((int)pos.x % 10) / 10;
-	    add_object(new PulsingLight(center, 1.0f + pseudo_rnd, 0.8f, 1.0f, Color(1.0f, 0.3f, 0.0f, 1.0f)));
-	  }
-	}
+        uint32_t id = tm->get_tile_id(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 (id == 1517) {
+      float pseudo_rnd = (float)((int)pos.x % 10) / 10;
+      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 ((id == 173) || (id == 1700) || (id == 1705) || (id == 1706)) {
+      // space lights a bit
+      if ((((tm->get_tile_id(x-1, y)) != tm->get_tile_id(x,y))
+          && (tm->get_tile_id(x, y-1) != tm->get_tile_id(x,y)))
+          || ((x % 3 == 0) && (y % 3 == 0))) {
+        float pseudo_rnd = (float)((int)pos.x % 10) / 10;
+        add_object(new PulsingLight(center, 1.0f + pseudo_rnd, 0.8f, 1.0f, Color(1.0f, 0.3f, 0.0f, 1.0f)));
+      }
+    }
 
       }
     }
@@ -606,6 +613,18 @@ Sector::activate(const Vector& player_pos)
   camera->reset(player->get_pos());
   update_game_objects();
 
+  //Run default.nut just before init script
+  //Check to see if it's in a levelset (info file)
+  std::string basedir = FileSystem::dirname(get_level()->filename);
+  if(PHYSFS_exists((basedir + "/info").c_str())) {
+    try {
+      IFileStream in(basedir + "/default.nut");
+      run_script(in, std::string("Sector(") + name + ") - default.nut");
+    } catch(std::exception& ) {
+      // doesn't exist or erroneous; do nothing
+    }
+  }
+
   // Run init script
   if(init_script != "") {
     std::istringstream in(init_script);
@@ -884,7 +903,7 @@ static const float SHIFT_DELTA = 7.0f;
 /** r1 is supposed to be moving, r2 a solid object */
 void check_collisions(collision::Constraints* constraints,
                       const Vector& movement, const Rect& r1, const Rect& r2,
-                      GameObject* object = NULL, MovingObject* other = NULL)
+                      GameObject* object = NULL, MovingObject* other = NULL, const Vector& addl_ground_movement = Vector(0,0))
 {
   if(!collision::intersects(r1, r2))
     return;
@@ -897,10 +916,10 @@ void check_collisions(collision::Constraints* constraints,
     return;
 
   // calculate intersection
-  float itop = r1.get_bottom() - r2.get_top();
+  float itop    = r1.get_bottom() - r2.get_top();
   float ibottom = r2.get_bottom() - r1.get_top();
-  float ileft = r1.get_right() - r2.get_left();
-  float iright = r2.get_right() - r1.get_left();
+  float ileft   = r1.get_right() - r2.get_left();
+  float iright  = r2.get_right() - r1.get_left();
 
   if(fabsf(movement.y) > fabsf(movement.x)) {
     if(ileft < SHIFT_DELTA) {
@@ -921,6 +940,7 @@ void check_collisions(collision::Constraints* constraints,
     }
   }
 
+  constraints->ground_movement += addl_ground_movement;
   if(other != NULL) {
     HitResponse response = other->collision(*object, dummy);
     if(response == PASSTHROUGH)
@@ -928,7 +948,7 @@ void check_collisions(collision::Constraints* constraints,
 
     if(other->get_movement() != Vector(0, 0)) {
       // TODO what todo when we collide with 2 moving objects?!?
-      constraints->ground_movement = other->get_movement();
+      constraints->ground_movement += other->get_movement();
     }
   }
 
@@ -976,30 +996,30 @@ Sector::collision_tilemap(collision::Constraints* constraints,
 
     for(int x = starttilex; x*32 < max_x; ++x) {
       for(int y = starttiley; y*32 < max_y; ++y) {
-	const Tile* tile = solids->get_tile(x, y);
-	if(!tile)
-	  continue;
-	// skip non-solid tiles
-	if((tile->getAttributes() & Tile::SOLID) == 0)
-	  continue;
-	// only handle unisolid when the player is falling down and when he was
-	// above the tile before
-	if(tile->getAttributes() & Tile::UNISOLID) {
-	  if(movement.y <= 0 || dest.get_bottom() - movement.y - SHIFT_DELTA > y*32)
-	    continue;
-	}
-
-	if(tile->getAttributes() & Tile::SLOPE) { // slope tile
-	  AATriangle triangle;
-	  Vector p1(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset());
-	  Vector p2((x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset());
-	  triangle = AATriangle(p1, p2, tile->getData());
-
-	  collision::rectangle_aatriangle(constraints, dest, triangle);
-	} else { // normal rectangular tile
-	  Rect rect(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset(), (x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset());
-	  check_collisions(constraints, movement, dest, rect);
-	}
+    const Tile* tile = solids->get_tile(x, y);
+    if(!tile)
+      continue;
+    // skip non-solid tiles
+    if((tile->getAttributes() & Tile::SOLID) == 0)
+      continue;
+    // only handle unisolid when the player is falling down and when he was
+    // above the tile before
+    if(tile->getAttributes() & Tile::UNISOLID) {
+      if(movement.y <= 0 || dest.get_bottom() - movement.y - SHIFT_DELTA > y*32)
+        continue;
+    }
+
+    if(tile->getAttributes() & Tile::SLOPE) { // slope tile
+      AATriangle triangle;
+      Vector p1(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset());
+      Vector p2((x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset());
+      triangle = AATriangle(p1, p2, tile->getData());
+
+      collision::rectangle_aatriangle(constraints, dest, triangle, solids->get_movement());
+    } else { // normal rectangular tile
+      Rect rect(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset(), (x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset());
+      check_collisions(constraints, movement, dest, rect, NULL, NULL, solids->get_movement());
+    }
       }
     }
   }
@@ -1025,10 +1045,10 @@ Sector::collision_tile_attributes(const Rect& dest) const
 
     for(int x = starttilex; x*32 < max_x; ++x) {
       for(int y = starttiley; y*32 < max_y; ++y) {
-	const Tile* tile = solids->get_tile(x, y);
-	if(!tile)
-	  continue;
-	result |= tile->getAttributes();
+    const Tile* tile = solids->get_tile(x, y);
+    if(!tile)
+      continue;
+    result |= tile->getAttributes();
       }
     }
   }
@@ -1303,9 +1323,9 @@ Sector::handle_collisions()
         get_hit_normal(moving_object->dest, moving_object_2->dest,
                        hit, normal);
         if(!moving_object->collides(*moving_object_2, hit))
-          return;
+          continue;
         if(!moving_object_2->collides(*moving_object, hit))
-          return;
+          continue;
 
         moving_object->collision(*moving_object_2, hit);
         moving_object_2->collision(*moving_object, hit);
@@ -1361,18 +1381,18 @@ Sector::is_free_of_tiles(const Rect& rect, const bool ignoreUnisolid) const
 
     for(int x = starttilex; x*32 <= max_x; ++x) {
       for(int y = starttiley; y*32 <= max_y; ++y) {
-	const Tile* tile = solids->get_tile(x, y);
-	if(!tile) continue;
-	if(tile->getAttributes() & Tile::SLOPE) {
-	  AATriangle triangle;
-	  Vector p1(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset());
-	  Vector p2((x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset());
-	  triangle = AATriangle(p1, p2, tile->getData());
-	  Constraints constraints;
-	  return collision::rectangle_aatriangle(&constraints, rect, triangle);
-	}
-	if((tile->getAttributes() & Tile::SOLID) && !ignoreUnisolid) return false;
-	if((tile->getAttributes() & Tile::SOLID) && !(tile->getAttributes() & Tile::UNISOLID)) return false;
+    const Tile* tile = solids->get_tile(x, y);
+    if(!tile) continue;
+    if(tile->getAttributes() & Tile::SLOPE) {
+      AATriangle triangle;
+      Vector p1(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset());
+      Vector p2((x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset());
+      triangle = AATriangle(p1, p2, tile->getData());
+      Constraints constraints;
+      return collision::rectangle_aatriangle(&constraints, rect, triangle);
+    }
+    if((tile->getAttributes() & Tile::SOLID) && !ignoreUnisolid) return false;
+    if((tile->getAttributes() & Tile::SOLID) && !(tile->getAttributes() & Tile::UNISOLID)) return false;
       }
     }
   }
@@ -1457,7 +1477,7 @@ Sector::play_music(MusicType type)
       sound_manager->play_music(music);
       break;
     case HERRING_MUSIC:
-      sound_manager->play_music("music/salcon.ogg");
+      sound_manager->play_music("music/invincible.ogg");
       break;
     case HERRING_WARNING_MUSIC:
       sound_manager->stop_music(TUX_INVINCIBLE_TIME_WARNING);
@@ -1567,3 +1587,22 @@ Sector::get_ambient_blue()
 {
   return ambient_light.blue;
 }
+
+void
+Sector::set_gravity(float gravity)
+{
+  log_warning << "Changing a Sector's gravitational constant might have unforseen side-effects" << std::endl;
+
+  this->gravity = gravity;
+
+  for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) {
+    GameObject* game_object = *i;
+    if(!game_object) continue;
+    if(!game_object->is_valid()) continue;
+    UsesPhysic *physics_object = dynamic_cast<UsesPhysic*>(game_object);
+    if (!physics_object) continue;
+
+    physics_object->physic.set_gravity(gravity);
+  }
+}
+