--- deliantra/server/common/init.C 2007/04/12 14:18:04 1.31 +++ deliantra/server/common/init.C 2007/05/17 13:24:54 1.34 @@ -74,8 +74,8 @@ PLAYERDIR, MAPDIR, ARCHETYPES, REGIONS, TREASURES, UNIQUE_DIR, TEMPLATE_DIR, TMPDIR, - STAT_LOSS_ON_DEATH, PK_LUCK_PENALTY, + STAT_LOSS_ON_DEATH, PERMANENT_EXPERIENCE_RATIO, DEATH_PENALTY_RATIO, DEATH_PENALTY_LEVEL, @@ -87,11 +87,11 @@ SEARCH_ITEMS, SPELL_ENCUMBRANCE, SPELL_FAILURE_EFFECTS, + SET_FRIENDLY_FIRE, CASTING_TIME, REAL_WIZ, EXPLORE_MODE, SPELLPOINT_LEVEL_DEPEND, - SET_FRIENDLY_FIRE, MOTD, "rules", "news", @@ -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; @@ -235,7 +241,7 @@ at = at->next; } - LOG (llevDebug, "You Need a archetype called 'map' and it have to contain start map\n"); + LOG (llevDebug, "You need an archetype of type 'map' and it has to contain the player start map\n"); exit (-1); }