X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.hpp;h=b2ee2199e8949e9b719b57dfee73732d286fc3c8;hb=d753e2c21ae6af1fb8876529695dcc7f6a46e5f0;hp=80ed7340a7218a3ee6346343fd59cf23eca52f29;hpb=f3e5e57c9996168a4889ae8e195be25f8b7e629b;p=supertux.git

diff --git a/src/sector.hpp b/src/sector.hpp
index 80ed7340a..b2ee2199e 100644
--- a/src/sector.hpp
+++ b/src/sector.hpp
@@ -1,7 +1,7 @@
 //  $Id$
 //
 //  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.de
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -21,6 +21,7 @@
 
 #include <string>
 #include <vector>
+#include <memory>
 #include <squirrel.h>
 
 #include "direction.hpp"
@@ -44,21 +45,27 @@ class ScriptInterpreter;
 class SpawnPoint;
 class MovingObject;
 class CollisionHit;
+class Level;
 
 enum MusicType {
   LEVEL_MUSIC,
-  HERRING_MUSIC
+  HERRING_MUSIC,
+  HERRING_WARNING_MUSIC
 };
 
-/** This class holds a sector (a part of a level) and all the game objects
- * (badguys, player, background, tilemap, ...)
+/**
+ * This class holds a sector (a part of a level) and all the game objects in
+ * the sector
  */
 class Sector
 {
 public:
-  Sector();
+  Sector(Level* parent);
   ~Sector();
 
+  /// get parent level
+  Level* get_level();
+
   /// read sector from lisp file
   void parse(const lisp::Lisp& lisp);
   void parse_old_format(const lisp::Lisp& lisp);
@@ -89,7 +96,10 @@ public:
   const std::string& get_name() const
   { return name; }
 
-  /// tests if a given rectangle is inside the sector
+  /**
+   * tests if a given rectangle is inside the sector
+   * (a rectangle that is on top of the sector is considered inside)
+   */
   bool inside(const Rect& rectangle) const;
 
   void play_music(MusicType musictype);
@@ -106,10 +116,21 @@ public:
   /** Get total number of badguys */
   int get_total_badguys();
 
+  /** Get total number of GameObjects of given type */
+  template<class T> int get_total_count()
+  {
+    int total = 0;
+    for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) {
+      if (dynamic_cast<T*>(*i)) total++;
+    }
+    return total;
+  }
+
   void collision_tilemap(const Rect& dest, const Vector& movement, CollisionHit& hit) const;
 
   /** Checks if at the specified rectangle are gameobjects with STATIC flag set
-   * (or solid tiles from the tilemap)
+   * (or solid tiles from the tilemap).
+   * This does not(!) include badguys or players.
    */
   bool is_free_space(const Rect& rect) const;
 
@@ -122,7 +143,12 @@ public:
 
   Rect get_active_region();
 
+  typedef std::vector<GameObject*> GameObjects;
+  typedef std::vector<MovingObject*> MovingObjects;
+  typedef std::vector<SpawnPoint*> SpawnPoints;
+
 private:
+  Level* level; /**< Parent level containing this sector */
   uint32_t collision_tile_attributes(const Rect& dest) const;
 
   void before_object_remove(GameObject* object);
@@ -131,22 +157,33 @@ private:
   void try_expose(GameObject* object);
   void try_unexpose(GameObject* object);
   
-  bool collision_static(MovingObject* object, const Vector& movement);
-  
   /** Checks for all possible collisions. And calls the
       collision_handlers, which the collision_objects provide for this
       case (or not). */
   void handle_collisions();
-  
+ 
+  /**
+   * Does collision detection between 2 objects and does instant
+   * collision response handling in case of a collision
+   */
   void collision_object(MovingObject* object1, MovingObject* object2) const;
+
+  /**
+   * Does collision detection of an object against all other static
+   * objects (and the tilemap) in the level. Collision response is done
+   * for the first hit in time. (other hits get ignored, the function
+   * should be called repeatedly to resolve those)
+   *
+   * returns true if the collision detection should be aborted for this object
+   * (because of ABORT_MOVE in the collision response or no collisions)
+   */
+  bool collision_static(MovingObject* object, const Vector& movement);
+
+  
   GameObject* parse_object(const std::string& name, const lisp::Lisp& lisp);
 
   void fix_old_tiles();
 
-  typedef std::vector<GameObject*> GameObjects;
-  typedef std::vector<MovingObject*> MovingObjects;
-  typedef std::vector<SpawnPoint*> SpawnPoints;
-
   static Sector* _current;
   
   std::string name;
@@ -160,11 +197,18 @@ private:
  
   MusicType currentmusic;
 
-  CollisionGrid* grid;
+  std::auto_ptr<CollisionGrid> grid;
 
   HSQOBJECT sector_table;
+  /// sector scripts
+  typedef std::vector<HSQOBJECT> ScriptList;
+  ScriptList scripts;
 
 public: // TODO make this private again
+  /// show collision rectangles of moving objects (for debugging)
+  static bool show_collrects;
+  static bool draw_solids_only;
+  
   GameObjects gameobjects;
   MovingObjects moving_objects;
   SpawnPoints spawnpoints;