--- cf.schmorp.de/server/common/map.C	2007/09/12 11:10:09	1.129
+++ cf.schmorp.de/server/common/map.C	2007/09/30 20:22:14	1.130
@@ -319,7 +319,32 @@
                 if (op->inv)
                   sum_weight (op);
 
-                insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
+                if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
+                  {
+                    // we insert manually because
+                    // a) its way faster
+                    // b) we remove manually, too, and there are good reasons for that
+                    // c) its correct
+                    mapspace &ms = at (op->x, op->y);
+
+                    op->flag [FLAG_REMOVED] = false;
+
+                    op->above = 0;
+                    op->below = ms.top;
+
+                    if (ms.top)
+                      ms.top->above = op;
+                    else
+                      ms.bot = op;
+
+                    ms.top = op;
+                    ms.flags_ = 0;
+                  }
+                else
+                  {
+                    f.parse_warn (format ("object %s out of range", op->debug_desc ()));
+                    op->destroy ();
+                  }
               }
 
             continue;