[ViewVC] Diff of: cvs/deliantra/server/common/loader.C

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.100 by root, Tue Sep 4 05:43:20 2007 UTC vs.
Revision 1.108 by elmex, Sun Apr 13 13:32:48 2008 UTC

 /*
- * 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.
  *
  * This program is distributed in the hope that it will be useful,
  * 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/>.
  *
- * 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.
    sub/add_weight will transcend the environment updating the carrying
    variable. */
 #include <global.h>
 #include <loader.h>
 #include <sproto.h>
 /////////////////////////////////////////////////////////////////////////////
+extern archetype *loading_arch;
 /* This table is only necessary to convert objects that existed before the
  * spell object conversion to the new object.  It was not practical
  * to go through every mapping looking for every potion, rod, wand, etc
  * that had a sp set and update to the new value.  So this maps the
   "spell_magic_drain",          /* 122 */
   "spell_counterspell",         /* 123 */
   "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 */
   "spell_cause_heavy_wounds",   /* 131 */
   "spell_charm_monsters",       /* 132 */
   "spell_cause_rabies",         /* 204 */
   "spell_glyph",                /* 205 */
   NULL
 };
-extern bool loading_arch;
 /* This function checks the object after it has been loaded (when we
  * get the 'end' in the input stream).  This function can be used to
  * deal with legacy objects where fields may have changed.  It can also be used
  * to check for objects to make sure there are no common errors.
  */
   /* Old spellcasting object - need to load in the appropiate object */
   if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
        /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
        ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
     {
-      /* Fireall is bizarre in that spell type was stored in dam.  Rest are 'normal'
+      /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
        * in that spell was stored in sp.
        */
       object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
       insert_ob_in_ob (tmp, this);
       randomitems = NULL;   /* So another spell isn't created for this object */
     {
       switch (f.kw)
         {
           case KW_uuid:
             if (const char *s = f.get_str ())
-              {
+              if (!uuid.parse (s))
-                unsigned int version;
-                unsigned long long seq;
-                if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
-                  {
+                {
-                    uuid.seq = seq;
+                  f.parse_warn ("unparseable uuid");
-                    break;
+                  uuid = UUID::gen ();
-                  }
+                }
-              }
-            uuid = gen_uuid ();
             break;
           case KW_oid:
             f.get (this, f.get_sint32 ());
             break;
           case KW_attach:       f.get_ornull (attach); break;
           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:
             {
               object *tmp = object::read (f);
               tmp->deactivate ();
               {
                 // was: insert_ob_in_ob (tmp, op);
                 // 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);
                 if (!op_inv)
                   {
               loading_arch
                 ? archetype::get  (f.get_str ())
                 : 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:
             f.delayed_deref (this, owner, f.get_str ());
             break;
           case KW_is_turnable:          GET_FLAG (this, FLAG_IS_TURNABLE); break;
           case KW_is_used_up:           GET_FLAG (this, FLAG_IS_USED_UP); break;
           case KW_alive:                GET_FLAG (this, FLAG_ALIVE); break;
           case KW_applied:              GET_FLAG (this, FLAG_APPLIED); break;
           case KW_unpaid:               GET_FLAG (this, FLAG_UNPAID); break;
+          case KW_player_sold:          GET_FLAG (this, FLAG_PLAYER_SOLD); break;
           case KW_is_animated:          GET_FLAG (this, FLAG_ANIMATE); break;
           case KW_no_pick:              GET_FLAG (this, FLAG_NO_PICK); break;
           case KW_reflecting:           GET_FLAG (this, FLAG_REFLECTING); break;
           case KW_changing:             GET_FLAG (this, FLAG_CHANGING); break;
           case KW_splitting:            GET_FLAG (this, FLAG_SPLITTING); break;
   /* We don't need to worry about the arch's extra fields - they
    * will get taken care of the copy_to method.
    */
-  {
+  f.put (KW_uuid, op->uuid.c_str ());
-    char uids[64];
-    snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
-    f.put (KW_uuid, (const char *)uids);
-  }
 #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)
   if (object *owner = op->owner)
   CMP_OUT (name_pl);
   CMP_OUT (custom_name);
   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 );
   if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/loader.C (file contents): Revision 1.100 by root, Tue Sep 4 05:43:20 2007 UTC vs. Revision 1.108 by elmex, Sun Apr 13 13:32:48 2008 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.100 by root, Tue Sep 4 05:43:20 2007 UTC vs.
Revision 1.108 by elmex, Sun Apr 13 13:32:48 2008 UTC