--- deliantra/server/common/loader.C	2006/12/12 21:39:56	1.22
+++ deliantra/server/common/loader.C	2006/12/23 06:41:39	1.27
@@ -28,7 +28,6 @@
 
 #include <global.h>
 #include <loader.h>
-#include <newserver.h>
 #include <sproto.h>
 
 /* Maps the MOVE_* values to names */
@@ -282,7 +281,7 @@
     op->name_pl = op->name;
 
   /* objects now have a materialname.  try to patch it in */
-  if (!(IS_WEAPON (op) && op->level > 0))
+  if (!(op->is_weapon () && op->level > 0))
     {
       if (op->map != NULL)
         set_materialname (op, op->map->difficulty, NULL);
@@ -828,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;
@@ -1185,7 +1183,7 @@
     KW_generator,
     KW_is_thrown,
     KW_auto_apply,
-    KW_treasure,
+    KW_NULL, // was KW_treasure
     KW_player_sold,
     /* 20 */
     KW_see_invisible,
@@ -1432,10 +1430,10 @@
   CMP_OUT (move_slow);
   CMP_OUT (move_slow_penalty);
 
-  if (!COMPARE_FLAGS (op, tmp))
+  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++)