--- deliantra/server/include/map.h	2008/12/27 08:41:44	1.107
+++ deliantra/server/include/map.h	2009/05/05 04:51:56	1.112
@@ -136,7 +136,7 @@
   void update_ ();
   MTH void update ()
   {
-    if (!(flags_ & P_UPTODATE))
+    if (expect_false (!(flags_ & P_UPTODATE)))
       update_ ();
   }
 
@@ -296,6 +296,11 @@
   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);
@@ -400,7 +405,7 @@
 int out_of_map (maptile *m, int x, int y);
 maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
 void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
-void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
+void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/);
 int on_same_map (const object *op1, const object *op2);
 int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
 
@@ -491,6 +496,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)				\
    {									\
@@ -516,6 +522,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)			\
@@ -526,6 +533,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)    ,			\