--- deliantra/server/include/map.h	2009/01/08 19:23:44	1.111
+++ deliantra/server/include/map.h	2009/11/04 14:45:30	1.115
@@ -5,18 +5,19 @@
  * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -136,7 +137,7 @@
   void update_ ();
   MTH void update ()
   {
-    if (!(flags_ & P_UPTODATE))
+    if (expect_false (!(flags_ & P_UPTODATE)))
       update_ ();
   }
 
@@ -405,7 +406,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);
 
@@ -520,7 +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
+// setting m, nx, ny to the map and -coordinate and dx, dy to the offset 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)					\
@@ -530,17 +531,20 @@
         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
+// same as ordered_mapwalk, 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);			\
+#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1)			\
+  for (maprect *r_e_c_t = (map)->split_to_tiles (			\
+         (ox) + (dx0)    , (oy) + (dy0)    ,				\
+         (ox) + (dx1) + 1, (oy) + (dy1) + 1);				\
        r_e_c_t->m;							\
        ++r_e_c_t)							\
-    rect_mapwalk (r_e_c_t, (op)->x, (op)->y)
+    rect_mapwalk (r_e_c_t, (ox), (oy))
+
+#define unordered_mapwalk(op,dx0,dy0,dx1,dy1)				\
+  unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1)
 
 #endif