--- deliantra/server/common/init.C	2011/02/26 11:34:31	1.62
+++ deliantra/server/common/init.C	2012/01/03 11:25:30	1.65
@@ -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
  * 
@@ -72,10 +72,7 @@
   LOCALDIR,
   PLAYERDIR,
   MAPDIR,
-  ARCHETYPES,
-  TREASURES,
   UNIQUE_DIR,
-  "",
   TMPDIR,
   PK_LUCK_PENALTY,
   STAT_LOSS_ON_DEATH,
@@ -139,15 +136,15 @@
 {
   const char *cp;
 
-  if (cp = getenv ("DELIANTRA_CONFDIR"    )) settings.confdir     = cp; 
-  if (cp = getenv ("DELIANTRA_LIBDIR"     )) settings.datadir     = cp;
+  if (cp = getenv ("DELIANTRA_CONFDIR"    )) settings.confdir     = cp;
+
+  if (cp = getenv ("DELIANTRA_LIBDIR"     )) settings.datadir     = cp; /* deprecated */
+  if (cp = getenv ("DELIANTRA_DATADIR"    )) settings.datadir     = cp;
+  if (cp = getenv ("DELIANTRA_MAPDIR"     )) settings.mapdir      = cp;
+
   if (cp = getenv ("DELIANTRA_LOCALDIR"   )) settings.localdir    = cp;
   if (cp = getenv ("DELIANTRA_PLAYERDIR"  )) settings.playerdir   = cp;
-  if (cp = getenv ("DELIANTRA_MAPDIR"     )) settings.mapdir      = cp; 
-  if (cp = getenv ("DELIANTRA_ARCHETYPES" )) settings.archetypes  = cp; 
-  if (cp = getenv ("DELIANTRA_TREASURES"  )) settings.treasures   = cp; 
-  if (cp = getenv ("DELIANTRA_UNIQUEDIR"  )) settings.uniquedir   = cp; 
-  if (cp = getenv ("DELIANTRA_TEMPLATEDIR")) settings.templatedir = cp; 
+  if (cp = getenv ("DELIANTRA_UNIQUEDIR"  )) settings.uniquedir   = cp;
   if (cp = getenv ("DELIANTRA_TMPDIR"     )) settings.tmpdir      = cp;
   if (cp = getenv ("DELIANTRA_LOGFILE"    )) settings.logfilename = cp;
 }