--- deliantra/server/common/init.C 2007/03/14 00:04:58 1.29 +++ deliantra/server/common/init.C 2007/05/17 14:14:54 1.35 @@ -1,5 +1,5 @@ /* - * CrossFire, A Multiplayer game for X-windows + * CrossFire, A Multiplayer game * * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team * Copyright (C) 2002 Mark Wedel & Crossfire Development Team @@ -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, - CASTING_TIME, - REAL_WIZ, + SET_FRIENDLY_FIRE, + 0, + 0, EXPLORE_MODE, SPELLPOINT_LEVEL_DEPEND, - SET_FRIENDLY_FIRE, MOTD, "rules", "news", @@ -106,8 +106,6 @@ ARMOR_WEIGHT_LINEAR, ARMOR_SPEED_IMPROVEMENT, ARMOR_SPEED_LINEAR, - 1, /* no_player_stealing */ - 1, /* create_home_portals */ }; /* perhaps not the best place for this, but needs to be @@ -150,15 +148,11 @@ { init_globals (); init_block (); - init_anim (); /* Must be after we read in the bitmaps */ - init_archetypes (); /* Reads all archetypes from file */ init_dynamic (); init_attackmess (); - init_clocks (); 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. @@ -171,27 +165,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; @@ -237,63 +239,10 @@ 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); } -unsigned long todtick; - -/* - * Write out the current time to the file so time does not - * reset every time the server reboots. - */ -void -write_todclock (void) -{ - char filename[MAX_BUF]; - FILE *fp; - - sprintf (filename, "%s/clockdata", settings.localdir); - if ((fp = fopen (filename, "w")) == NULL) - { - LOG (llevError, "Cannot open %s for writing\n", filename); - return; - } - fprintf (fp, "%lu", todtick); - fclose (fp); -} - -/* - * initialises the gametime and TOD counters - * Called by init_library(). - */ -void -init_clocks (void) -{ - char filename[MAX_BUF]; - FILE *fp; - static int has_been_done = 0; - - if (has_been_done) - return; - else - has_been_done = 1; - - sprintf (filename, "%s/clockdata", settings.localdir); - LOG (llevDebug, "Reading clockdata from %s...\n", filename); - if ((fp = fopen (filename, "r")) == NULL) - { - LOG (llevError, "Can't open %s.\n", filename); - todtick = 0; - write_todclock (); - return; - } - - fscanf (fp, "%lu", &todtick); - LOG (llevDebug, "todtick=%lu\n", todtick); - fclose (fp); -} - /* * initialises the attack messages. * Called by init_library().