--- deliantra/server/common/init.C 2007/04/16 06:23:39 1.32 +++ deliantra/server/common/init.C 2007/04/16 11:09:30 1.33 @@ -150,13 +150,11 @@ { init_globals (); init_block (); - init_archetypes (); /* Reads all archetypes from file */ init_dynamic (); init_attackmess (); init_experience (); } - /* init_environ initialises values from the environmental variables. * it needs to be called very early, since command line options should * overwrite these if specified. @@ -169,27 +167,35 @@ cp = getenv ("CROSSFIRE_LIBDIR"); if (cp) settings.datadir = cp; + cp = getenv ("CROSSFIRE_LOCALDIR"); if (cp) settings.localdir = cp; + cp = getenv ("CROSSFIRE_PLAYERDIR"); if (cp) settings.playerdir = cp; + cp = getenv ("CROSSFIRE_MAPDIR"); if (cp) settings.mapdir = cp; + cp = getenv ("CROSSFIRE_ARCHETYPES"); if (cp) settings.archetypes = cp; + cp = getenv ("CROSSFIRE_TREASURES"); if (cp) settings.treasures = cp; + cp = getenv ("CROSSFIRE_UNIQUEDIR"); if (cp) settings.uniquedir = cp; + cp = getenv ("CROSSFIRE_TEMPLATEDIR"); if (cp) settings.templatedir = cp; + cp = getenv ("CROSSFIRE_TMPDIR"); if (cp) settings.tmpdir = cp;