--- deliantra/server/common/map.C	2007/04/17 10:06:32	1.100
+++ deliantra/server/common/map.C	2007/05/28 05:35:51	1.105
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
@@ -176,8 +176,7 @@
   if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
     return 0;
 
-  if (ob->head != NULL)
-    ob = ob->head;
+  ob = ob->head_ ();
 
   /* We basically go through the stack of objects, and if there is
    * some other object that has NO_PASS or FLAG_ALIVE set, return
@@ -217,13 +216,17 @@
           /* Broke apart a big nasty if into several here to make
            * this more readable.  first check - if the space blocks
            * movement, can't move here.
-           * second - if a monster, can't move there, unles it is a 
+           * second - if a monster, can't move there, unless it is a 
            * hidden dm
            */
           if (OB_MOVE_BLOCK (ob, tmp))
             return 1;
-          if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&
-              tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))
+
+          if (tmp->flag [FLAG_ALIVE]
+              && tmp->head_ () != ob
+              && tmp != ob
+              && tmp->type != DOOR
+              && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
             return 1;
         }
 
@@ -355,38 +358,14 @@
     return;
 
   for (mapspace *ms = spaces + size (); ms-- > spaces; )
-    for (object *tmp = ms->bot; tmp; tmp = tmp->above)
+    for (object *op = ms->bot; op; op = op->above)
       {
         /* already multipart - don't do anything more */
-        if (!tmp->head && !tmp->more)
+        if (op->head_ () == op && !op->more && op->arch->more)
           {
-            /* If there is nothing more to this object, this for loop
-             * won't do anything.
-             */
-            archetype *at;
-            object *last, *op;
-            for (at = tmp->arch->more, last = tmp;
-                 at;
-                 at = at->more, last = op)
-              {
-                op = arch_to_object (at);
-
-                /* update x,y coordinates */
-                op->x += tmp->x;
-                op->y += tmp->y;
-                op->head = tmp;
-                op->map = this;
-                last->more = op;
-                op->name = tmp->name;
-                op->title = tmp->title;
-
-                /* we could link all the parts onto tmp, and then just
-                 * call insert_ob_in_map once, but the effect is the same,
-                 * as insert_ob_in_map will call itself with each part, and
-                 * the coding is simpler to just to it here with each part.
-                 */
-                insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
-              }
+            op->remove ();
+            op->expand_tail ();
+            insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
           }
       }
 }
@@ -433,23 +412,23 @@
 void
 maptile::activate ()
 {
-  if (!spaces)
-    return;
+  active = true;
 
-  for (mapspace *ms = spaces + size (); ms-- > spaces; )
-    for (object *op = ms->bot; op; op = op->above)
-      op->activate_recursive ();
+  if (spaces)
+    for (mapspace *ms = spaces + size (); ms-- > spaces; )
+      for (object *op = ms->bot; op; op = op->above)
+        op->activate_recursive ();
 }
 
 void
 maptile::deactivate ()
 {
-  if (!spaces)
-    return;
+  active = false;
 
-  for (mapspace *ms = spaces + size (); ms-- > spaces; )
-    for (object *op = ms->bot; op; op = op->above)
-      op->deactivate_recursive ();
+  if (spaces)
+    for (mapspace *ms = spaces + size (); ms-- > spaces; )
+      for (object *op = ms->bot; op; op = op->above)
+        op->deactivate_recursive ();
 }
 
 bool
@@ -693,9 +672,9 @@
 {
   for (;;)
     {
-      keyword kw = thawer.get_kv ();
+      thawer.next ();
 
-      switch (kw)
+      switch (thawer.kw)
         {
           case KW_msg:
             thawer.get_ml (KW_endmsg, msg);
@@ -799,7 +778,7 @@
           if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
             unique = 1;
 
-          if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
+          if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
             {
               op->destroy_inv (false);
               op->destroy ();
@@ -894,9 +873,7 @@
       for (mapspace *ms = spaces + size (); ms-- > spaces; )
         while (object *op = ms->bot)
           {
-            if (op->head)
-              op = op->head;
-
+            op = op->head_ ();
             op->destroy_inv (false);
             op->destroy ();
           }