--- deliantra/server/include/map.h	2008/07/14 16:42:49	1.96
+++ deliantra/server/include/map.h	2009/01/08 19:23:44	1.111
@@ -49,6 +49,14 @@
 
 #define MAP_LAYERS		3
 
+// tile map index
+enum {
+  TILE_UP    = 0,
+  TILE_RIGHT = 1,
+  TILE_DOWN  = 2,
+  TILE_LEFT  = 3,
+};
+
 /* Values for in_memory below */
 enum {
   MAP_ACTIVE,
@@ -65,7 +73,6 @@
  */
 // all those macros are herewith declared legacy
 #define GET_MAP_FLAGS(M,X,Y)         (M)->at((X),(Y)).flags ()
-#define GET_MAP_LIGHT(M,X,Y)         (M)->at((X),(Y)).light
 #define GET_MAP_OB(M,X,Y)            (M)->at((X),(Y)).bot
 #define GET_MAP_TOP(M,X,Y)           (M)->at((X),(Y)).top
 #define GET_MAP_FACE_OBJ(M,X,Y,L)    (M)->at((X),(Y)).faces_obj[L]
@@ -102,9 +109,8 @@
  * function that does more of the work can hopefully be used to replace
  * lots of duplicate checks currently in the code.
  */
-#define P_OUT_OF_MAP	0x10000   /* This space is outside the map */
-#define	P_NEW_MAP	0x20000
-                                /* Coordinates passed result in a new tiled map  */
+#define P_OUT_OF_MAP	0x10000 /* This space is outside the map */
+#define	P_NEW_MAP	0x20000 /* Coordinates passed result in a new tiled map  */
 
 /* Instead of having numerous arrays that have information on a
  * particular space (was map, floor, floor2, map_ob),
@@ -112,46 +118,54 @@
  * This puts it all in one place, and should also make it easier
  * to extend information about a space.
  */
+INTERFACE_CLASS (mapspace)
 struct mapspace
 {
-  object *bot, *top;            /* lowest/highest object on this space */
-  object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */
+  object *ACC (RW, bot);
+  object *ACC (RW, top);        /* lowest/highest object on this space */
+  object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */
+  uint32_t smell;			// the last count a player was seen here, or 0
+  static uint32_t smellcount;           // global smell counter
   uint8 flags_;                 /* flags about this space (see the P_ values above) */
-  sint8 light;                  /* How much light this space provides */
-  MoveType move_block;          /* What movement types this space blocks */
-  MoveType move_slow;           /* What movement types this space slows */
-  MoveType move_on;             /* What movement types are activated */
-  MoveType move_off;            /* What movement types are activated */
+  sint8 ACC (RW, light);                  /* How much light this space provides */
+  MoveType ACC (RW, move_block);          /* What movement types this space blocks */
+  MoveType ACC (RW, move_slow);           /* What movement types this space slows */
+  MoveType ACC (RW, move_on);             /* What movement types are activated */
+  MoveType ACC (RW, move_off);            /* What movement types are activated */
 
   void update_ ();
-  void update ()
+  MTH void update ()
   {
     if (!(flags_ & P_UPTODATE))
       update_ ();
   }
 
-  uint8 flags ()
+  MTH uint8 flags ()
   {
     update ();
     return flags_;
   }
+
+  MTH void invalidate ()
+  {
+    flags_ = 0;
+  }
   
-  // maybe only inline quick flags_ checking?
-  object *player ()
+  MTH object *player ()
   {
-    // search from the top, because players are usually on top
-    // make usually == always and this non-amortized O(1)
-    // could gte rid of P_PLAYER, too, then
+    object *op;
+
     if (flags () & P_PLAYER)
-      for (object *op = top; op; op = op->below)
-        if (op->type == PLAYER)
-          return op;
+      for (op = top; op->type != PLAYER; op = op->below)
+        ;
+    else
+      op = 0;
 
-    return 0;
+    return op;
   }
 
   // return the item volume on this mapspace in cm³
-  uint64 volume () const;
+  MTH uint64 volume () const;
 
   bool blocks (MoveType mt) const
   {
@@ -164,6 +178,15 @@
   }
 };
 
+// a rectangular area of a map
+struct maprect
+{
+  maptile *m;
+  int x0, y0;
+  int x1, y1;
+  int dx, dy; // offset to go from local coordinates to original tile */
+};
+
 struct shopitems : zero_initialised
 {
   const char *name;             /* name of the item in question, null if it is the default item */
@@ -224,7 +247,8 @@
   bool ACC (RW, per_party);
   bool ACC (RW, outdoor);  /* True if an outdoor map */
   bool ACC (RW, no_drop);   /* avoid auto-dropping (on death) anything on this map */
-  uint8 ACC (RW, darkness);        /* indicates level of darkness of map */
+  sint8 ACC (RW, darkness);        /* indicates level of darkness of map */
+  static sint8 outdoor_darkness; /* the global darkness level outside */
 
   uint16 ACC (RW, enter_x);        /* enter_x and enter_y are default entrance location */
   uint16 ACC (RW, enter_y);        /* on the map if none are set in the exit */
@@ -249,6 +273,14 @@
   int ACC (RW, max_nrof);                 // maximum nrof of any single item on a mapspace
   uint64 ACC (RW, max_volume);            // maximum volume for all items on a mapspace
 
+  // the maptile:: is neccessary here for the perl interface to work
+  MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
+  {
+    return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
+  }
+
+  static void adjust_daylight ();
+
   MTH void activate ();
   MTH void deactivate ();
 
@@ -261,11 +293,14 @@
   MTH void do_decay_objects ();
   MTH void update_buttons ();
   MTH int change_map_light (int change);
-  static void change_all_map_light (int change); //PERL
-  MTH void set_darkness_map ();
   MTH int estimate_difficulty () const;
 
   MTH void play_sound (faceidx sound, int x, int y) const;
+  MTH void say_msg (const char *msg, int x, int y) const;
+
+  // connected links
+  oblinkpt *find_link (shstr_tmp id);
+  MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
 
   // set the given flag on all objects in the map
   MTH void set_object_flag (int flag, int value = 1);
@@ -308,7 +343,7 @@
 
   MTH void touch () { last_access = runtime; }
 
-  MTH bool tile_available (int dir, bool load = true);
+  MTH maptile *tile_available (int dir, bool load = true);
 
   // find the map that is at coordinate x|y relative to this map
   // TODO: need a better way than passing by reference
@@ -335,8 +370,14 @@
   static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
   object *pick_random_object (rand_gen &gen = rndm) const;
 
-  mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
-  mapspace       &at (uint32 x, uint32 y)       { return spaces [x * height + y]; }
+  mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
+
+  // return an array of maprects corresponding
+  // to the given rectangular area. the last rect will have
+  // a 0 map pointer.
+  // the array will be stored in a static memory area,
+  // so recursion is not atm. supported
+  maprect *split_to_tiles (int x0, int y0, int x1, int y1);
 };
 
 /* This is used by get_rangevector to determine where the other
@@ -449,5 +490,57 @@
   return pos;
 }
 
+// iterate over a rectangular area relative to op
+// can be used as a single statement, but both iterate macros
+// invocations must not be followed by a ";"
+// see common/los.C for usage example
+// the walk will be ordered, outer loop x, inner loop y
+// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
+// "continue" will skip to the next space
+#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1)			\
+ for (int dx = (dx0); dx <= (dx1); ++dx)				\
+   {									\
+     sint16 nx, ny;							\
+     maptile *m = 0;							\
+     									\
+     for (int dy = (dy0); dy <= (dy1); ++dy)				\
+       {								\
+         /* check to see if we can simply go one down quickly, */	\
+         /* if not, do it the slow way                         */	\
+         if (!m || ++ny >= m->height)					\
+           {								\
+             nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; 	\
+     									\
+             if (!xy_normalise (m, nx, ny))				\
+               m = 0;							\
+           }
+
+#define ordered_mapwalk_end						\
+      }									\
+  }
+
+// loop over every space in the given maprect,
+// setting m, nx, ny to the map and -coordinate and dx, dy to the offste relative to dx0,dy0
+// the iterator code must be a single statement following this macro call, similar to "if"
+// "continue" will skip to the next space
+#define rect_mapwalk(rect,dx0,dy0)					\
+  statementvar (maptile *, m, (rect)->m)				\
+    for (int nx = (rect)->x0; nx < (rect)->x1; ++nx)			\
+      for (int ny = (rect)->y0; ny < (rect)->y1; ++ny)			\
+        statementvar (int, dx, nx + (rect)->dx - (dx0))			\
+        statementvar (int, dy, ny + (rect)->dy - (dy0))
+
+// same as above, but the walk will not follow any particular
+// order (unorded), but is likely faster.
+// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
+// "continue" will skip to the next space
+#define unordered_mapwalk(op,dx0,dy0,dx1,dy1)				\
+  for (maprect *r_e_c_t = (op)->map->split_to_tiles (			\
+         (op)->x + (dx0)    , (op)->y + (dy0)    ,			\
+         (op)->x + (dx1) + 1, (op)->y + (dy1) + 1);			\
+       r_e_c_t->m;							\
+       ++r_e_c_t)							\
+    rect_mapwalk (r_e_c_t, (op)->x, (op)->y)
+
 #endif