--- deliantra/server/common/arch.C	2010/05/06 22:35:41	1.106
+++ deliantra/server/common/arch.C	2012/01/03 11:25:30	1.110
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  * 
@@ -55,9 +55,9 @@
 //+GPL
 
 /*
- * Creates an object.  This function is called by get_archetype ()
+ * Creates an object.  This function is called by archetype::get ()
  * if it fails to find the appropriate archetype.
- * Thus get_archetype() will be guaranteed to always return
+ * Thus archetype::get() will be guaranteed to always return
  * an object, and never NULL.
  */
 static object *
@@ -532,7 +532,7 @@
 void
 archetype::gc ()
 {
-  int cnt = max (1, min (allarch.size () / 128, dirtycnt));
+  int cnt = max (1, min<int> (allarch.size () / 128, dirtycnt));
   dirtycnt = max (0, dirtycnt - cnt);
 
   do
@@ -586,12 +586,6 @@
  * object containing a copy of the archetype.
  */
 object *
-get_archetype (const char *name)
-{
-  return archetype::get (name);
-}
-
-object *
 archetype::get (const char *name)
 {
   archetype *at = find (name);