--- deliantra/server/common/loader.C	2007/05/17 14:14:54	1.82
+++ deliantra/server/common/loader.C	2007/05/26 15:44:02	1.85
@@ -262,6 +262,12 @@
 void
 object::post_load_check ()
 {
+  if (type >= NUM_TYPES)
+    {
+      LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
+      type = 0;
+    }
+
   switch (type)
     {
       case BOW:
@@ -380,8 +386,10 @@
        * 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 */
@@ -511,11 +519,7 @@
     }
 }
 
-#define GET_FLAG(op,flag)       \
-  if (f.get_sint32 ())     \
-    SET_FLAG (op, flag);        \
-  else                          \
-    CLEAR_FLAG (op, flag)       \
+#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
 
 bool
 object::parse_kv (object_thawer &f)
@@ -771,7 +775,7 @@
             break;
 
           case KW_friendly:
-            if (f.get_sint32 ())
+            if (f.get_bool ())
               if (type != PLAYER)
                 add_friendly_object (this);