--- deliantra/server/common/loader.C	2006/12/18 03:00:02	1.25
+++ deliantra/server/common/loader.C	2006/12/25 11:25:49	1.28
@@ -489,7 +489,7 @@
     CLEAR_FLAG (op, flag)       \
 
 int
-parse_object (object *op, object_thawer & thawer, int map_flags)
+parse_object (object *op, object_thawer &thawer, int map_flags)
 {
   bool ismore = 0;
   object *op_inv = op->inv;
@@ -504,7 +504,7 @@
           case KW_object:
             thawer.get (op->name);
 
-            if (op->arch != NULL)
+            if (op->arch)
               op->arch->name = op->name;
 
             break;
@@ -827,7 +827,6 @@
           case KW_use_content_on_gen:   GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
           case KW_is_thrown:            GET_FLAG (op, FLAG_IS_THROWN); break;
           case KW_auto_apply:           GET_FLAG (op, FLAG_AUTO_APPLY); break;
-          case KW_treasure:             GET_FLAG (op, FLAG_TREASURE); break;
           case KW_see_invisible:        GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
           case KW_can_roll:             GET_FLAG (op, FLAG_CAN_ROLL); break;
           case KW_overlay_floor:        GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
@@ -1065,14 +1064,12 @@
  *  LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
  *
  */
-
 int
-load_object (object_thawer & fp, object *op, int map_flags)
+load_object (object_thawer &fp, object *op, int map_flags)
 {
   return parse_object (op, fp, map_flags);
 }
 
-
 /* This takes a buffer, scans it for variables, and sets those variables
  * as appropriate in op.
  *
@@ -1184,7 +1181,7 @@
     KW_generator,
     KW_is_thrown,
     KW_auto_apply,
-    KW_treasure,
+    KW_NULL, // was KW_treasure
     KW_player_sold,
     /* 20 */
     KW_see_invisible,
@@ -1431,10 +1428,10 @@
   CMP_OUT (move_slow);
   CMP_OUT (move_slow_penalty);
 
-  if (op->flags != tmp->flags)
+  if (op->flag != tmp->flag)
     for (i = 0; i <= NUM_FLAGS; i++)
-      if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i)))
-        f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0");
+      if (flag_names [i] && op->flag [i] != tmp->flag [i])
+        f.put (flag_names [i], op->flag [i] ? "1" : "0");
 
   /* Save body locations */
   for (i = 0; i < NUM_BODY_LOCATIONS; i++)