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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.83 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.85 by root, Sat May 26 15:44:02 2007 UTC

        * 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 */
 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;
               CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
             break;
           case KW_friendly:
-            if (f.get_sint32 ())
+            if (f.get_bool ())
               if (type != PLAYER)
                 add_friendly_object (this);
             break;

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