X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.cpp;h=46927eb600680552f6623e5820dd5db8e1bc47ad;hb=609794e5b7fb466ca1a53d7a2406e2a8ed547de8;hp=2a56628ce825b85249ee93aaf88be3d3e60c83fd;hpb=c43ea9b0d5372718888138ea2cc4abcd5acb5299;p=supertux.git

diff --git a/src/sector.cpp b/src/sector.cpp
index 2a56628ce..46927eb60 100644
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -26,8 +26,8 @@
 #include <fstream>
 #include <stdexcept>
 
-#include "app/globals.h"
 #include "sector.h"
+#include "player_status.h"
 #include "object/gameobjs.h"
 #include "object/camera.h"
 #include "object/background.h"
@@ -39,31 +39,25 @@
 #include "lisp/list_iterator.h"
 #include "tile.h"
 #include "audio/sound_manager.h"
-#include "gameloop.h"
+#include "game_session.h"
 #include "resources.h"
 #include "statistics.h"
 #include "collision_grid.h"
-#include "special/collision.h"
-#include "math/rectangle.h"
+#include "collision_grid_iterator.h"
+#include "object_factory.h"
+#include "collision.h"
+#include "math/rect.h"
 #include "math/aatriangle.h"
 #include "object/coin.h"
 #include "object/block.h"
 #include "object/invisible_block.h"
-#include "object/platform.h"
 #include "object/bullet.h"
 #include "badguy/jumpy.h"
-#include "badguy/snowball.h"
-#include "badguy/bouncing_snowball.h"
-#include "badguy/flame.h"
-#include "badguy/mriceblock.h"
-#include "badguy/mrbomb.h"
-#include "badguy/dispenser.h"
 #include "badguy/spike.h"
-#include "badguy/spiky.h"
-#include "badguy/nolok_01.h"
-#include "trigger/door.h"
 #include "trigger/sequence_trigger.h"
-#include "trigger/secretarea_trigger.h"
+#include "player_status.h"
+
+//#define USE_GRID
 
 Sector* Sector::_current = 0;
 
@@ -72,7 +66,7 @@ Sector::Sector()
     currentmusic(LEVEL_MUSIC)
 {
   song_title = "Mortimers_chipdisko.mod";
-  player = new Player();
+  player = new Player(&player_status);
   add_object(player);
 
   grid = new CollisionGrid(32000, 32000);
@@ -101,51 +95,32 @@ Sector::~Sector()
 GameObject*
 Sector::parse_object(const std::string& name, const lisp::Lisp& reader)
 {
-  if(name == "background") {
-    return new Background(reader);
-  } else if(name == "camera") {
+  if(name == "camera") {
     Camera* camera = new Camera(this);
     camera->parse(reader);
     return camera;
-  } else if(name == "tilemap") {
-    return  new TileMap(reader);
   } else if(name == "particles-snow") {
     SnowParticleSystem* partsys = new SnowParticleSystem();
     partsys->parse(reader);
     return partsys;
+  } else if(name == "particles-rain") {
+    RainParticleSystem* partsys = new RainParticleSystem();
+    partsys->parse(reader);
+    return partsys;
   } else if(name == "particles-clouds") {
     CloudParticleSystem* partsys = new CloudParticleSystem();
     partsys->parse(reader);
     return partsys;
-  } else if(name == "door") {
-    return new Door(reader);
-  } else if(name == "secretarea") {
-    return new SecretAreaTrigger(reader);
-  } else if(name == "platform") {
-    return new Platform(reader);
-  } else if(name == "jumpy" || name == "money") {
+  } else if(name == "money") { // for compatibility with old maps
     return new Jumpy(reader);
-  } else if(name == "snowball") {
-    return new SnowBall(reader);
-  } else if(name == "bouncingsnowball") {
-    return new BouncingSnowball(reader);
-  } else if(name == "flame") {
-    return new Flame(reader);
-  } else if(name == "mriceblock") {
-    return new MrIceBlock(reader);
-  } else if(name == "mrbomb") {
-    return new MrBomb(reader);
-  } else if(name == "dispenser") {
-    return new Dispenser(reader);
-  } else if(name == "spike") {
-    return new Spike(reader);
-  } else if(name == "spiky") {
-    return new Spiky(reader);
-  } else if(name == "nolok_01") {
-    return new Nolok_01(reader);
-  }
-
-  std::cerr << "Unknown object type '" << name << "'.\n";
+  } 
+
+  try {
+    return create_object(name, reader);
+  } catch(std::exception& e) {
+    std::cerr << e.what() << "\n";
+  }
+  
   return 0;
 }
 
@@ -182,14 +157,15 @@ Sector::parse(const lisp::Lisp& sector)
 
   update_game_objects();
   fix_old_tiles();
-  update_game_objects();
   if(!camera) {
     std::cerr << "sector '" << name << "' does not contain a camera.\n";
-    camera = new Camera(this);
-    add_object(camera);
+    update_game_objects();
+    add_object(new Camera(this));
   }
   if(!solids)
     throw std::runtime_error("sector does not contain a solid tile layer.");
+
+  update_game_objects();
 }
 
 void
@@ -238,6 +214,8 @@ Sector::parse_old_format(const lisp::Lisp& reader)
     add_object(new CloudParticleSystem());
   else if(particlesystem == "snow")
     add_object(new SnowParticleSystem());
+  else if(particlesystem == "rain")
+    add_object(new RainParticleSystem());
 
   Vector startpos(100, 170);
   reader.get("start_pos_x", startpos.x);
@@ -355,7 +333,8 @@ Sector::fix_old_tiles()
         add_object(new Brick(pos, tile->getData()));
         solids->change(x, y, 0);
       } else if(tile->getAttributes() & Tile::GOAL) {
-        add_object(new SequenceTrigger(pos, "endsequence"));
+        std::string sequence = tile->getData() == 0 ? "endsequence" : "stoptux";
+        add_object(new SequenceTrigger(pos, sequence));
         solids->change(x, y, 0);
       }
     }                                                   
@@ -414,23 +393,6 @@ Sector::add_object(GameObject* object)
 void
 Sector::activate(const std::string& spawnpoint)
 {
-  _current = this;
-
-  // Apply bonuses from former levels
-  switch (player_status.bonus)
-    {
-    case PlayerStatus::NO_BONUS:
-      break;
-                                                                                
-    case PlayerStatus::FLOWER_BONUS:
-      player->got_power = Player::FIRE_POWER;  // FIXME: add ice power to here
-      // fall through
-                                                                                
-    case PlayerStatus::GROWUP_BONUS:
-      player->grow(false);
-      break;
-    }
-
   SpawnPoint* sp = 0;
   for(SpawnPoints::iterator i = spawnpoints.begin(); i != spawnpoints.end();
       ++i) {
@@ -438,37 +400,50 @@ Sector::activate(const std::string& spawnpoint)
       sp = *i;
       break;
     }
-  }
+  }                                                                           
   if(!sp) {
     std::cerr << "Spawnpoint '" << spawnpoint << "' not found.\n";
+    if(spawnpoint != "main") {
+      activate("main");
+    } else {
+      activate(Vector(0, 0));
+    }
   } else {
-    player->move(sp->pos);
+    activate(sp->pos);
   }
-
-  camera->reset(player->get_pos());
 }
 
-Vector
-Sector::get_best_spawn_point(Vector pos)
+void
+Sector::activate(const Vector& player_pos)
 {
-  Vector best_reset_point = Vector(-1,-1);
+  _current = this;
 
-  for(SpawnPoints::iterator i = spawnpoints.begin(); i != spawnpoints.end();
-      ++i) {
-    if((*i)->name != "main")
-      continue;
-    if((*i)->pos.x > best_reset_point.x && (*i)->pos.x < pos.x)
-      best_reset_point = (*i)->pos;
-  }
+  player->move(player_pos);
+  camera->reset(player->get_pos());
+}
 
-  return best_reset_point;
+Rect
+Sector::get_active_region()
+{
+  return Rect(
+    camera->get_translation() - Vector(1600, 1200),
+    camera->get_translation() + Vector(1600, 1200));
 }
 
 void
 Sector::action(float elapsed_time)
 {
   player->check_bounds(camera);
-                                                                                
+
+#if 0
+  CollisionGridIterator iter(*grid, get_active_region());
+  while(MovingObject* object = iter.next()) {
+    if(!object->is_valid())
+      continue;
+
+    object->action(elapsed_time);
+  }
+#else
   /* update objects */
   for(GameObjects::iterator i = gameobjects.begin();
           i != gameobjects.end(); ++i) {
@@ -478,7 +453,8 @@ Sector::action(float elapsed_time)
     
     object->action(elapsed_time);
   }
-                                                                                
+#endif
+  
   /* Handle all possible collisions. */
   collision_handler();                                                                              
   update_game_objects();
@@ -553,7 +529,16 @@ Sector::draw(DrawingContext& context)
 {
   context.push_transform();
   context.set_translation(camera->get_translation());
-  
+
+#if 0
+  CollisionGridIterator iter(*grid, get_active_region());
+  while(MovingObject* object = iter.next()) {
+    if(!object->is_valid())
+      continue;
+
+    object->draw(context);
+  }
+#else
   for(GameObjects::iterator i = gameobjects.begin();
       i != gameobjects.end(); ++i) {
     GameObject* object = *i; 
@@ -562,6 +547,7 @@ Sector::draw(DrawingContext& context)
     
     object->draw(context);
   }
+#endif
 
   context.pop_transform();
 }
@@ -604,7 +590,7 @@ Sector::collision_tilemap(MovingObject* object, int depth)
   int max_y = int(y2+1);
 
   CollisionHit temphit, hit;
-  Rectangle dest = object->get_bbox();
+  Rect dest = object->get_bbox();
   dest.move(object->movement);
   hit.time = -1; // represents an invalid value
   for(int x = starttilex; x*32 < max_x; ++x) {
@@ -612,10 +598,15 @@ Sector::collision_tilemap(MovingObject* object, int depth)
       const Tile* tile = solids->get_tile(x, y);
       if(!tile)
         continue;
+      // skip non-solid tiles
       if(!(tile->getAttributes() & Tile::SOLID))
         continue;
-      if((tile->getAttributes() & Tile::UNISOLID) && object->movement.y < 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(object->movement.y < 0 || object->get_bbox().p2.y > y*32)
+          continue;
+      }
 
       if(tile->getAttributes() & Tile::SLOPE) { // slope tile
         AATriangle triangle;
@@ -629,7 +620,7 @@ Sector::collision_tilemap(MovingObject* object, int depth)
             hit = temphit;
         }
       } else { // normal rectangular tile
-        Rectangle rect(x*32, y*32, (x+1)*32, (y+1)*32);
+        Rect rect(x*32, y*32, (x+1)*32, (y+1)*32);
         if(Collision::rectangle_rectangle(temphit, dest,
               object->movement, rect)) {
           if(temphit.time > hit.time)
@@ -661,9 +652,9 @@ void
 Sector::collision_object(MovingObject* object1, MovingObject* object2)
 {
   CollisionHit hit;
-  Rectangle dest1 = object1->get_bbox();
+  Rect dest1 = object1->get_bbox();
   dest1.move(object1->get_movement());
-  Rectangle dest2 = object2->get_bbox();
+  Rect dest2 = object2->get_bbox();
   dest2.move(object2->get_movement());
 
   Vector movement = object1->get_movement() - object2->get_movement();
@@ -692,7 +683,7 @@ Sector::collision_object(MovingObject* object1, MovingObject* object2)
 void
 Sector::collision_handler()
 {
-#if 0
+#ifdef USE_GRID
   grid->check_collisions();
 #else
   for(std::vector<GameObject*>::iterator i = gameobjects.begin();
@@ -736,24 +727,25 @@ Sector::collision_handler()
 bool
 Sector::add_bullet(const Vector& pos, float xm, Direction dir)
 {
-  if(player->got_power == Player::FIRE_POWER) {
+  // TODO remove this function and move these checks elsewhere...
+  static const size_t MAX_FIRE_BULLETS = 2;
+  static const size_t MAX_ICE_BULLETS = 1;
+
+  Bullet* new_bullet = 0;
+  if(player_status.bonus == FIRE_BONUS) {
     if(bullets.size() > MAX_FIRE_BULLETS-1)
       return false;
-  } else if(player->got_power == Player::ICE_POWER) {
+    new_bullet = new Bullet(pos, xm, dir, FIRE_BULLET);
+  } else if(player_status.bonus == ICE_BONUS) {
     if(bullets.size() > MAX_ICE_BULLETS-1)
       return false;
-  }
-                                                                                
-  Bullet* new_bullet = 0;
-  if(player->got_power == Player::FIRE_POWER)
-    new_bullet = new Bullet(pos, xm, dir, FIRE_BULLET);
-  else if(player->got_power == Player::ICE_POWER)
     new_bullet = new Bullet(pos, xm, dir, ICE_BULLET);
-  else
-    throw std::runtime_error("wrong bullet type.");
+  } else {
+    return false;
+  }
   add_object(new_bullet);
 
-  SoundManager::get()->play_sound(IDToSound(SND_SHOOT));
+  sound_manager->play_sound("shoot");
 
   return true;
 }
@@ -774,47 +766,28 @@ Sector::add_floating_text(const Vector& pos, const std::string& text)
 void
 Sector::load_music()
 {
-  char* song_path;
-  char* song_subtitle;
-                                                                                
-  level_song = SoundManager::get()->load_music(datadir + "/music/" + song_title);
-                                                                                
-  song_path = (char *) malloc(sizeof(char) * datadir.length() +
-                              strlen(song_title.c_str()) + 8 + 5);
-  song_subtitle = strdup(song_title.c_str());
-  strcpy(strstr(song_subtitle, "."), "\0");
-  sprintf(song_path, "%s/music/%s-fast%s", datadir.c_str(),
-          song_subtitle, strstr(song_title.c_str(), "."));
-  if(!SoundManager::get()->exists_music(song_path)) {
-    level_song_fast = level_song;
-  } else {
-    level_song_fast = SoundManager::get()->load_music(song_path);
-  }
-  free(song_subtitle);
-  free(song_path);
+  level_song = sound_manager->load_music(
+    get_resource_filename("/music/" + song_title));
 }
 
 void
-Sector::play_music(int type)
+Sector::play_music(MusicType type)
 {
   currentmusic = type;
   switch(currentmusic) {
-    case HURRYUP_MUSIC:
-      SoundManager::get()->play_music(level_song_fast);
-      break;
     case LEVEL_MUSIC:
-      SoundManager::get()->play_music(level_song);
+      sound_manager->play_music(level_song);
       break;
     case HERRING_MUSIC:
-      SoundManager::get()->play_music(herring_song);
+      sound_manager->play_music(herring_song);
       break;
     default:
-      SoundManager::get()->halt_music();
+      sound_manager->halt_music();
       break;
   }
 }
 
-int
+MusicType
 Sector::get_music_type()
 {
   return currentmusic;
@@ -824,19 +797,18 @@ int
 Sector::get_total_badguys()
 {
   int total_badguys = 0;
-#if 0
-  for(GameObjects::iterator i = gameobjects_new.begin(); i != gameobjects_new.end(); ++i)
-    {
+  for(GameObjects::iterator i = gameobjects.begin();
+      i != gameobjects.end(); ++i) {
     BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
     if(badguy)
       total_badguys++;
-    }
-#endif
+  }
+
   return total_badguys;
 }
 
 bool
-Sector::inside(const Rectangle& rect) const
+Sector::inside(const Rect& rect) const
 {
   if(rect.p1.x > solids->get_width() * 32 
       || rect.p1.y > solids->get_height() * 32