--- deliantra/server/common/object.C	2006/09/11 11:46:52	1.26
+++ deliantra/server/common/object.C	2006/09/11 12:10:21	1.28
@@ -1,9 +1,3 @@
-
-/*
- * static char *rcsid_object_c =
- *   "$Id: object.C,v 1.26 2006/09/11 11:46:52 root Exp $";
- */
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -31,15 +25,14 @@
    sub/add_weight will transcend the environment updating the carrying
    variable. */
 #include <global.h>
-#ifndef WIN32                   /* ---win32 exclude headers */
-# include <stdio.h>
-# include <sys/types.h>
-# include <sys/uio.h>
-#endif /* win32 */
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/uio.h>
 #include <object.h>
 #include <funcpoint.h>
 #include <skills.h>
 #include <loader.h>
+
 int nrofallocobjects = 0;
 
 object *objects;                /* Pointer to the list of used objects */
@@ -251,10 +244,10 @@
  * an object is carrying.  It goes through in figures out how much
  * containers are carrying, and sums it up.
  */
-signed long
+long
 sum_weight (object *op)
 {
-  signed long sum;
+  long sum;
   object *inv;
 
   for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
@@ -893,17 +886,11 @@
    * that is being removed.
    */
   else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
-    {
-      update_now = 1;
-    }
+    update_now = 1;
   else if (action == UP_OBJ_FACE)
-    {
-      /* Nothing to do for that case */
-    }
+    /* Nothing to do for that case */;
   else
-    {
-      LOG (llevError, "update_object called with invalid action: %d\n", action);
-    }
+    LOG (llevError, "update_object called with invalid action: %d\n", action);
 
   if (update_now)
     {