--- deliantra/server/common/info.C	2006/09/10 16:00:23	1.4
+++ deliantra/server/common/info.C	2006/12/23 05:25:17	1.9
@@ -1,9 +1,3 @@
-
-/*
- * static char *rcsid_info_c =
- *    "$Id: info.C,v 1.4 2006/09/10 16:00:23 root Exp $";
- */
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -24,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 #include <global.h>
@@ -66,13 +60,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
     }
 }
 
@@ -97,6 +86,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);
@@ -105,7 +95,8 @@
             printf ("%4d", op->resist[i]);
           printf ("|%8lld|%9d|\n", (long long) op->stats.exp, new_exp (op));
         }
-      free_object (op);
+
+      op->destroy ();
     }
 }
 
@@ -129,12 +120,14 @@
           str[i + j] = ' ';
           j++;
         }
+
       if (bits & 1)
         str[i + j] = '1';
       else
         str[i + j] = '0';
+
       bits >>= 1;
     }
+
   str[i + j] = '\0';
-  return;
 }