--- deliantra/server/common/loader.C	2009/09/17 01:57:31	1.132
+++ deliantra/server/common/loader.C	2009/11/04 00:02:48	1.136
@@ -5,18 +5,19 @@
  * 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>
  */
@@ -995,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;
@@ -1100,57 +1104,6 @@
   return op->parse_kv (f);
 }
 
-/* This returns a string of the integer movement type */
-#if 0
-// unused function
-static char *
-get_string_move_type (MoveType mt)
-{
-  static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
-  int i, all_count = 0, count;
-
-  strcpy (retbuf, "");
-  strcpy (retbuf_all, " all");
-
-  /* Quick check, and probably fairly common */
-  if (mt == MOVE_ALL)
-    return retbuf_all + 1;
-  if (mt == 0)
-    {
-      strcpy (retbuf, "0");
-      return retbuf;
-    }
-
-  /* We basically slide the bits down.  Why look at MOVE_ALL?
-   * because we may want to return a string like 'all -swim',
-   * and if we just looked at mt, we couldn't get that.
-   */
-  for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
-    {
-      if (mt & (1 << count))
-        {
-          strcat (retbuf, " ");
-          strcat (retbuf, move_name[count]);
-        }
-      else
-        {
-          strcat (retbuf_all, " -");
-          strcat (retbuf_all, move_name[count]);
-          all_count++;
-        }
-    }
-  /* Basically, if there is a single negation, return it, eg
-   * 'all -swim'.  But more than that, just return the
-   * enumerated values.  It doesn't make sense to return
-   * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
-   */
-  if (all_count <= 1)
-    return retbuf_all + 1;
-  else
-    return retbuf + 1;
-}
-#endif
-
 // compare *op against *tmp and output differences
 static void
 write_diff (object_freezer &f, object *op, object *tmp)
@@ -1304,7 +1257,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)