--- deliantra/server/common/loader.C	2007/09/04 18:20:35	1.101
+++ deliantra/server/common/loader.C	2008/04/11 14:09:56	1.107
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * 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.
@@ -18,7 +18,7 @@
  * You should have received a copy of 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 <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
@@ -171,7 +171,7 @@
   "spell_disarm",               /* 124 */
   "spell_cure_confusion",       /* 125 */
   "spell_restoration",          /* 126 */
-  "was summon evil monster",    /* 127 *//* Not implenented as nothing used it */
+  "spell_summon_devil",         /* 127 *//* Not implenented as nothing used it */
   "spell_counterwall",          /* 128 */
   "spell_cause_light_wounds",   /* 129 */
   "spell_cause_medium_wounds",  /* 130 */
@@ -531,18 +531,11 @@
         {
           case KW_uuid:
             if (const char *s = f.get_str ())
-              {
-                unsigned int version;
-                unsigned long long seq;
-
-                if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
-                  {
-                    uuid.seq = seq;
-                    break;
-                  }
-              }
-
-            uuid = gen_uuid ();
+              if (!uuid.parse (s))
+                {
+                  f.parse_warn ("unparseable uuid");
+                  uuid = UUID::gen ();
+                }
             break;
 
           case KW_oid:
@@ -558,6 +551,7 @@
           case KW_skill:        f.get_ornull (skill); break;
           case KW_race:         f.get_ornull (race); break;
           case KW_slaying:      f.get_ornull (slaying); break;
+          case KW_tag:          f.get_ornull (tag); break;
 
           case KW_arch:
             {
@@ -569,6 +563,7 @@
                 // but manually adding it can improve map loading times a lot
                 // also, appending instead of prepending keeps the
                 // save ordering the same between repeated load/saves.
+                // and finally we do not want any funny effects
                 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
                 CLEAR_FLAG (tmp, FLAG_REMOVED);
 
@@ -600,7 +595,7 @@
                 : archetype::find (f.get_str ());
 
             if (!other_arch)
-              LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
+              f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
             break;
 
           case KW_owner:
@@ -1268,11 +1263,7 @@
    * will get taken care of the copy_to method.
    */
 
-  {
-    char uids[64];
-    snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
-    f.put (KW_uuid, (const char *)uids);
-  }
+  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)
@@ -1286,6 +1277,7 @@
   CMP_OUT (title);
   CMP_OUT (race);
   CMP_OUT (slaying);
+  CMP_OUT (tag);
   CMP_OUT (other_arch);
 
   if (op->msg  != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );