--- deliantra/server/common/loader.C	2008/11/16 03:52:12	1.125
+++ deliantra/server/common/loader.C	2009/10/23 03:08:34	1.135
@@ -1,22 +1,23 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,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>
  */
@@ -341,8 +342,8 @@
     {
       if (!skill)
         LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
-      else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) ||
-               (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2))
+      else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
+               (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
         LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
     }
 
@@ -463,6 +464,19 @@
             move_type = MOVE_WALK;
         }
     }
+
+  // if the object has an animation, try to provide a default face
+  if (has_anim ())
+    {
+      const animation &anim_ob = anim ();
+
+      if (anim_speed)
+        // if this item is time-animated, force the last frame
+        animate_object (this, 0);
+      else if (flag [FLAG_MONSTER])
+        // if it is a monster, set appropriate facing
+        animate_object (this, direction);
+    }
 }
 
 static void
@@ -929,7 +943,7 @@
           case KW_will_apply:           f.get (will_apply); break;
           case KW_attack_movement:      f.get (attack_movement); break;
           case KW_move_state:           f.get (move_status); break;
-          case KW_expmul:               f.get (expmul); break;
+          //case KW_expmul:               f.get (expmul); break;//D declared const for the time being
           case KW_glow_radius:          f.get (glow_radius); break;
           case KW_weapontype:           f.get (weapontype); break;
           case KW_casting_time:         f.get (casting_time); break;
@@ -965,7 +979,12 @@
             break;
 
           case KW_connected:
-            add_button_link (this, map, f.get_sint32 ());
+            {
+              shstr connected;
+
+              f.get (connected);
+              add_link (map, connected);
+            }
             break;
 
           case KW_randomitems:
@@ -977,7 +996,10 @@
                     : treasurelist::find (f.get_str ());
 
                 if (!randomitems)
-                  LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
+                  {
+                    LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
+                    randomitems = treasurelist::get (shstr_none); // avoid crashes
+                  }
               }
             else
               randomitems = 0;
@@ -1286,7 +1308,8 @@
    * will get taken care of the copy_to method.
    */
 
-  f.put (KW_uuid, op->uuid.c_str ());
+  if (op->uuid)
+    f.put (KW_uuid, op->uuid.c_str ());
 
 #define CMP_OUT(v)    if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
 #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
@@ -1312,8 +1335,8 @@
   if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
 
   if (op->animation_id != tmp->animation_id)
-    if (op->animation_id)
-      f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
+    if (op->has_anim ())
+      f.put (KW_animation, op->anim ().name);
     else
       {
         f.put (KW_animation, (const char *)0);
@@ -1380,8 +1403,8 @@
   CMP_OUT (glow_radius);
 
   if (op->flag [FLAG_IS_LINKED])
-    if (int i = get_button_value (op))
-      f.put (KW_connected, i);
+    if (auto (ol, op->find_link ()))
+      f.put (KW_connected, ol->id);
 
   CMP_OUT (randomitems);
   CMP_OUT2 (container, weight_limit);
@@ -1427,10 +1450,16 @@
 bool
 object::write (object_freezer &f)
 {
-  archetype *at = arch ? arch : archetype::empty;
-
-  f.put (KW_arch, at->archname);
-  write_diff (f, this, at);
+  if (is_arch ())
+    {
+      f.put (KW_object, arch->archname);
+      write_diff (f, this, archetype::empty);
+    }
+  else
+    {
+      f.put (KW_arch, arch->archname);
+      write_diff (f, this, arch);
+    }
 
   for (object *tmp = inv; tmp; tmp = tmp->below)
     tmp->write (f);