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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.78 by root, Mon May 7 06:01:47 2007 UTC vs.
Revision 1.92 by root, Tue Jul 10 05:51:37 2007 UTC

 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT 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 2 of the License, or
+ * 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
+ * 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, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
    sub/add_weight will transcend the environment updating the carrying
    variable. */
  * to check for objects to make sure there are no common errors.
  */
 void
 object::post_load_check ()
 {
-  // as a kind of a hack, we now adjust the range, shield and combat slots
+  if (type >= NUM_TYPES)
+    {
+      LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
+      type = 0;
+    }
   switch (type)
     {
       case BOW:
       case WAND:
       case ROD:
       case HORN:
-      case SKILL: // maybe have to think about this one, as skills get applied togethr with their governing weapons
-      case SKILL_TOOL:
-        if (slot [body_range].info != 1)
+        if (slot [body_range].info != -1)
           {
-            LOG (llevInfo, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
+            LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
-            slot [body_range].info = 1;
+            slot [body_range].info = -1;
           }
         break;
       case WEAPON:
-        if (slot [body_combat].info != 1)
+        if (slot [body_combat].info != -1)
           {
-            LOG (llevInfo, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
+            LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
-            slot [body_combat].info = 1;
+            slot [body_combat].info = -1;
           }
         break;
       case SHIELD:
-        if (slot [body_shield].info != 1)
+        if (slot [body_shield].info != -1)
           {
-            LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
+            LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
-            slot [body_shield].info = 1;
+            slot [body_shield].info = -1;
           }
         break;
       case PLAYER:
         if (slot [body_shield].info != 1)
           {
-            LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
+            LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
             slot [body_shield].info = 1;
           }
         if (slot [body_combat].info != 1)
           {
-            LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_combat].info);
+            LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
             slot [body_combat].info = 1;
+          }
+        if (slot [body_range].info != 1)
+          {
+            LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
+            slot [body_range].info = 1;
           }
         break;
     }
   /* We do some specialised handling to handle legacy cases of name_pl.
    * also have to catch is if this object is not using the normal name for
    * the object.  In that case, we also want to use the loaded name.
    * Otherwise, what happens is that the the plural name will lose
    * information (appear as just 'hearts' and not 'goblins heart')
    */
-  if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl)
+  if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
     name_pl = 0;
   if (!name_pl)
     name_pl = name;
   /* objects now have a materialname.  try to patch it in */
   if (!(is_weapon () && level > 0))
-    {
-      if (map != NULL)
-        set_materialname (this, map->difficulty, NULL);
+    set_materialname (this, map ? map->difficulty : 5, 0);
-      else
-        set_materialname (this, 5, NULL);
-    }
   /* only do these when program is first run - a bit
    * excessive to do this at every run - most of this is
    * really just to catch any errors - program will still run, but
    * not in the ideal fashion.
        * something that has item_power 1 is probably just fine if our calculated
        * value is 1 or 2 - these values are small enough that hard to be precise.
        * similarly, it item_power is 0, the first check will always pass,
        * but not the second one.
        */
+#if 0 //TODO
       if (ip > 2 * item_power && ip > (item_power + 3))
         LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
+#endif
     }
   /* 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 */
     {
       object *tmp = get_archetype_by_object_name (slaying);
       insert_ob_in_ob (tmp, this);
       randomitems = NULL;   /* So another spell isn't created for this object */
       /* without this, value is all screwed up */
-      value = arch->clone.value * inv->value;
+      value = arch->value * inv->value;
     }
   if (QUERY_FLAG (this, FLAG_MONSTER))
     {
       if (stats.hp > stats.maxhp)
 next: ;
     }
 }
-#define GET_FLAG(op,flag)       \
+#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
-  if (f.get_sint32 ())     \
-    SET_FLAG (op, flag);        \
-  else                          \
-    CLEAR_FLAG (op, flag)       \
 bool
 object::parse_kv (object_thawer &f)
 {
   object *op_inv = inv;
             if (QUERY_FLAG (this, FLAG_IDENTIFIED))
               CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
             break;
-          case KW_wiz:
-            GET_FLAG (this, FLAG_WIZ);
-            //TODO: move to check_object
-            if (QUERY_FLAG (this, FLAG_WIZ))
-              {
-                SET_FLAG (this, FLAG_WAS_WIZ);
-                SET_FLAG (this, FLAG_WIZPASS);
-                SET_FLAG (this, FLAG_WIZCAST);
-              }
-            else
-              {
-                CLEAR_FLAG (this, FLAG_WIZPASS);
-                CLEAR_FLAG (this, FLAG_WIZCAST);
-              }
-            break;
           case KW_friendly:
-            if (f.get_sint32 ())
+            if (f.get_bool ())
               if (type != PLAYER)
                 add_friendly_object (this);
             break;
           case KW_reflect_missile:      GET_FLAG (this, FLAG_REFL_MISSILE); break;
           case KW_reflect_spell:        GET_FLAG (this, FLAG_REFL_SPELL); break;
           case KW_no_magic:             GET_FLAG (this, FLAG_NO_MAGIC); break;
           case KW_no_drop:              GET_FLAG (this, FLAG_NO_DROP); break;
           case KW_random_movement:      GET_FLAG (this, FLAG_RANDOM_MOVE); break;
-          case KW_was_wiz:              GET_FLAG (this, FLAG_WAS_WIZ); break;
           case KW_no_fix_player:        GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
           case KW_is_lightable:         GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
           case KW_tear_down:            GET_FLAG (this, FLAG_TEAR_DOWN); break;
           case KW_can_use_shield:       GET_FLAG (this, FLAG_USE_SHIELD); break;
           case KW_can_cast_spell:       GET_FLAG (this, FLAG_CAST_SPELL); break;
               randomitems = 0;
             break;
           case KW_msg:
             f.get_ml (KW_endmsg, msg);
-            //TODO: allow longer messages
-            if (strlen (msg) >= HUGE_BUF)
-              {
-                LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
-                msg = "ERROR, please report: string too long, winged.\n";
-              }
             break;
           case KW_lore:
             f.get_ml (KW_endlore, lore);
-            //TODO: allow longer messages
-            /* Just print a warning so we can be reasonably safe
-             * about not overflowing the buffer.
-             */
-            if (strlen (lore) > (HUGE_BUF / 2))
-              LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
-                   HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
             break;
           case KW_editable:
           case KW_editor_folder:
             break;
   f.next ();
   object *op = object::create ();
   op->map = map;
-  arch->clone.copy_to (op);
+  arch->copy_to (op);
   // copy_to activates, this should be fixed properly
   op->deactivate ();
   if (!op->parse_kv (f))
     {
    * the 15'th element of this array should match that name.
    * If an entry is NULL, that is a flag not to loaded/saved.
    */
   static const keyword flag_names [NUM_FLAGS] = {
     KW_alive,
-    KW_wiz,
     KW_NULL,
     KW_NULL,
-    KW_was_wiz,
+    KW_NULL,
+    KW_NULL,
     KW_applied,
     KW_unpaid,
     KW_can_use_shield,
     KW_no_pick,
     KW_NULL, // walk_on
     if (op->animation_id)
       {
         f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
         if (!QUERY_FLAG (op, FLAG_ANIMATE))
-          f.put (KW_is_animated, (sint32) 0);
+          f.put (KW_is_animated, (sint32)0);
       }
     else
-      f.put (KW_animation, (const char *) 0);
+      f.put (KW_animation, (const char *)0);
   CMP_OUT2 (str, stats.Str);
   CMP_OUT2 (dex, stats.Dex);
   CMP_OUT2 (con, stats.Con);
   CMP_OUT2 (wis, stats.Wis);
   if (owner)
     return true;
   archetype *at = arch ? (archetype *)arch : empty_archetype;
-  f.put (KW_arch, at->name);
+  f.put (KW_arch, at->archname);
-  write_diff (f, this, &at->clone);
+  write_diff (f, this, at);
   for (object *tmp = inv; tmp; tmp = tmp->below)
     tmp->write (f);
   f.put (this);

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.78 by root, Mon May 7 06:01:47 2007 UTC vs. Revision 1.92 by root, Tue Jul 10 05:51:37 2007 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.78 by root, Mon May 7 06:01:47 2007 UTC vs.
Revision 1.92 by root, Tue Jul 10 05:51:37 2007 UTC