--- deliantra/server/common/loader.C	2006/12/12 21:39:56	1.22
+++ deliantra/server/common/loader.C	2006/12/18 03:00:02	1.25
@@ -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);
@@ -1432,7 +1431,7 @@
   CMP_OUT (move_slow);
   CMP_OUT (move_slow_penalty);
 
-  if (!COMPARE_FLAGS (op, tmp))
+  if (op->flags != tmp->flags)
     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");