--- deliantra/server/include/map.h	2006/12/26 20:04:09	1.36
+++ deliantra/server/include/map.h	2006/12/27 13:13:47	1.39
@@ -295,10 +295,15 @@
 
   MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
 
-  mapspace const &at (uint32 x, uint32 y) const { return spaces [x + width * y]; }
-  mapspace       &at (uint32 x, uint32 y)       { return spaces [x + width * y]; }
+  MTH void link ();
+  MTH void unlink ();
+
+  mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
+  mapspace       &at (uint32 x, uint32 y)       { return spaces [x * height + y]; }
 };
 
+#define for_all_maps(var) for (maptile *var = first_map; var; var = var->next)
+
 /* This is used by get_rangevector to determine where the other
  * creature is.  get_rangevector takes into account map tiling,
  * so you just can not look the the map coordinates and get the