--- deliantra/server/common/info.C	2006/09/14 22:33:58	1.5
+++ deliantra/server/common/info.C	2007/01/06 14:42:28	1.10
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -60,13 +61,8 @@
         }
 
       ch = describe_item (&at->clone, NULL);
-#ifndef WIN32
       printf ("%-16s|%6lld|%4d|%3d|%s|%s|%s\n", &at->clone.name, (long long) at->clone.stats.exp,
               at->clone.stats.hp, at->clone.stats.ac, ch, &at->name, gen_name);
-#else
-      printf ("%-16s|%6I64d|%4d|%3d|%s|%s|%s\n", &at->clone.name, (long long) at->clone.stats.exp,
-              at->clone.stats.hp, at->clone.stats.ac, ch, &at->name, gen_name);
-#endif
     }
 }
 
@@ -91,6 +87,7 @@
   for (at = first_archetype; at != NULL; at = at->next)
     {
       op = arch_to_object (at);
+
       if (QUERY_FLAG (op, FLAG_MONSTER))
         {
           bitstostring ((long) op->attacktype, NROFATTACKS, attbuf);
@@ -99,7 +96,8 @@
             printf ("%4d", op->resist[i]);
           printf ("|%8lld|%9d|\n", (long long) op->stats.exp, new_exp (op));
         }
-      free_object (op);
+
+      op->destroy ();
     }
 }
 
@@ -123,12 +121,14 @@
           str[i + j] = ' ';
           j++;
         }
+
       if (bits & 1)
         str[i + j] = '1';
       else
         str[i + j] = '0';
+
       bits >>= 1;
     }
+
   str[i + j] = '\0';
-  return;
 }