--- deliantra/server/include/map.h	2008/12/26 10:36:42	1.104
+++ deliantra/server/include/map.h	2009/01/08 03:03:24	1.109
@@ -109,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),
@@ -125,6 +124,8 @@
   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 ACC (RW, light);                  /* How much light this space provides */
   MoveType ACC (RW, move_block);          /* What movement types this space blocks */
@@ -296,6 +297,10 @@
 
   MTH void play_sound (faceidx sound, int x, int y) const;
 
+  // connected links
+  oblinkpt *find_link (shstr_tmp id);
+  MTH void trigger (shstr_tmp id, bool state = true, object *originator = 0);
+
   // set the given flag on all objects in the map
   MTH void set_object_flag (int flag, int value = 1);
   MTH void post_load_original ();
@@ -490,6 +495,7 @@
 // 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)				\
    {									\
@@ -504,9 +510,7 @@
            {								\
              nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; 	\
      									\
-             if (xy_normalise (m, nx, ny))				\
-               m->touch ();						\
-             else							\
+             if (!xy_normalise (m, nx, ny))				\
                m = 0;							\
            }
 
@@ -517,6 +521,7 @@
 // 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)			\
@@ -527,6 +532,7 @@
 // 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)    ,			\