--- deliantra/server/common/init.C	2008/05/06 17:05:17	1.45
+++ deliantra/server/common/init.C	2008/09/23 04:29:11	1.46
@@ -141,43 +141,20 @@
 void
 init_environ (void)
 {
-  char *cp;
+  const char *cp;
 
-  cp = getenv ("DELIANTRA_LIBDIR");
-  if (cp)
-    settings.datadir = cp;
+  if (cp = getenv ("DELIANTRA_CONFDIR"    )) settings.datadir     = cp; 
+  if (cp = getenv ("DELIANTRA_LIBDIR"     )) settings.datadir     = 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_TMPDIR"     )) settings.tmpdir      = cp;
 
-  cp = getenv ("DELIANTRA_LOCALDIR");
-  if (cp)
-    settings.localdir = cp;
-
-  cp = getenv ("DELIANTRA_PLAYERDIR");
-  if (cp)
-    settings.playerdir = cp;
-
-  cp = getenv ("DELIANTRA_MAPDIR");
-  if (cp)
-    settings.mapdir = cp;
-
-  cp = getenv ("DELIANTRA_ARCHETYPES");
-  if (cp)
-    settings.archetypes = cp;
-
-  cp = getenv ("DELIANTRA_TREASURES");
-  if (cp)
-    settings.treasures = cp;
-
-  cp = getenv ("DELIANTRA_UNIQUEDIR");
-  if (cp)
-    settings.uniquedir = cp;
-
-  cp = getenv ("DELIANTRA_TEMPLATEDIR");
-  if (cp)
-    settings.templatedir = cp;
-
-  cp = getenv ("DELIANTRA_TMPDIR");
-  if (cp)
-    settings.tmpdir = cp;
+  if (cp = getenv ("DELIANTRA_LOGFILE"    )) settings.logfilename = cp;
 }
 
 /*