--- deliantra/server/common/init.C	2006/09/21 00:05:24	1.14
+++ deliantra/server/common/init.C	2007/01/06 14:42:28	1.22
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -89,23 +90,14 @@
   SPELL_FAILURE_EFFECTS,
   CASTING_TIME,
   REAL_WIZ,
-  RECYCLE_TMP_MAPS,
   EXPLORE_MODE,
   SPELLPOINT_LEVEL_DEPEND,
   SET_FRIENDLY_FIRE,
-  "",                           /* Who format specifier */
-  "",                           /* who wiz format specifier */
   MOTD,
   "rules",
   "news",
   "",                           /* DM_MAIL */
-  0,                            /* This and the next 3 values are metaserver values */
-  "",
-  "",
-  0,
-  "",
   0, 0, 0, 0, 0, 0, 0, 0,       /* worldmap settings */
-  EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y,
   0,
   1.0,
 
@@ -146,56 +138,6 @@
   "Light"
 };
 
-
-/* This loads the emergency map information from a
- * .emergency file in the map directory.  Doing this makes
- * it easier to switch between map distributions (don't need
- * to recompile.  Note that there is no reason I see that
- * this could not be re-loaded during play, but it seems
- * like there should be little reason to do that.
- */
-static void
-init_emergency_mappath (void)
-{
-  char filename[MAX_BUF], tmpbuf[MAX_BUF];
-  FILE *fp;
-  int online = 0;
-
-  /* If this file doesn't exist, not a big deal */
-  sprintf (filename, "%s/%s/.emergency", settings.datadir, settings.mapdir);
-  if ((fp = fopen (filename, "r")) != NULL)
-    {
-      while (fgets (tmpbuf, MAX_BUF - 1, fp))
-        {
-          if (tmpbuf[0] == '#')
-            continue;           /* ignore comments */
-
-          if (online == 0)
-            {
-              tmpbuf[strlen (tmpbuf) - 1] = 0;  /* kill newline */
-              settings.emergency_mapname = strdup_local (tmpbuf);
-            }
-          else if (online == 1)
-            {
-              settings.emergency_x = atoi (tmpbuf);
-            }
-
-          else if (online == 2)
-            {
-              settings.emergency_y = atoi (tmpbuf);
-            }
-          online++;
-          if (online > 2)
-            break;
-        }
-      fclose (fp);
-      if (online <= 2)
-        LOG (llevError, "Online read partial data from %s\n", filename);
-      LOG (llevDebug, "Emergency mappath reset to %s (%d, %d)\n", settings.emergency_mapname, settings.emergency_x, settings.emergency_y);
-    }
-}
-
-
 /*
  * It is vital that init_library() is called by any functions
  * using this library.
@@ -204,7 +146,6 @@
  * init_function_pointers().  Good idea to also call init_vars and
  * init_hash_table if you are doing any object loading.
  */
-
 void
 init_library (void)
 {
@@ -219,12 +160,11 @@
   init_dynamic ();
   init_attackmess ();
   init_clocks ();
-  init_emergency_mappath ();
   init_experience ();
 }
 
 
-/* init_environ initializes values from the environmental variables.
+/* init_environ initialises values from the environmental variables.
  * it needs to be called very early, since command line options should
  * overwrite these if specified.
  */
@@ -292,11 +232,11 @@
       if (at->clone.type == MAP)
         {
           if (at->clone.race)
-            strcpy (first_map_ext_path, at->clone.race);
+            first_map_ext_path = at->clone.race;
 
           if (EXIT_PATH (&at->clone))
             {
-              strcpy (first_map_path, EXIT_PATH (&at->clone));
+              first_map_path = EXIT_PATH (&at->clone);
               return;
             }
         }
@@ -332,7 +272,7 @@
 }
 
 /*
- * Initializes the gametime and TOD counters
+ * initialises the gametime and TOD counters
  * Called by init_library().
  */
 
@@ -349,7 +289,7 @@
     has_been_done = 1;
 
   sprintf (filename, "%s/clockdata", settings.localdir);
-  LOG (llevDebug, "Reading clockdata from %s...", filename);
+  LOG (llevDebug, "Reading clockdata from %s...\n", filename);
   if ((fp = fopen (filename, "r")) == NULL)
     {
       LOG (llevError, "Can't open %s.\n", filename);
@@ -363,7 +303,7 @@
 }
 
 /*
- * Initializes the attack messages.
+ * initialises the attack messages.
  * Called by init_library().
  */
 
@@ -386,7 +326,7 @@
     has_been_done = 1;
 
   sprintf (filename, "%s/attackmess", settings.datadir);
-  LOG (llevDebug, "Reading attack messages from %s...", filename);
+  LOG (llevDebug, "Reading attack messages from %s...\n", filename);
   if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
     {
       LOG (llevError, "Can't open %s.\n", filename);
@@ -426,9 +366,9 @@
           attack_mess[mess][level].level = atoi (buf);
           p = strtok (NULL, "=");
           if (p != NULL)
-            attack_mess[mess][level].buf1 = strdup_local (p);
+            attack_mess[mess][level].buf1 = strdup (p);
           else
-            attack_mess[mess][level].buf1 = strdup_local ("");
+            attack_mess[mess][level].buf1 = strdup ("");
           mode = 2;
           continue;
         }
@@ -438,9 +378,9 @@
           attack_mess[mess][level].level = atoi (buf);
           p = strtok (NULL, "=");
           if (p != NULL)
-            attack_mess[mess][level].buf2 = strdup_local (p);
+            attack_mess[mess][level].buf2 = strdup (p);
           else
-            attack_mess[mess][level].buf2 = strdup_local ("");
+            attack_mess[mess][level].buf2 = strdup ("");
           mode = 3;
           continue;
         }
@@ -450,9 +390,9 @@
           attack_mess[mess][level].level = atoi (buf);
           p = strtok (NULL, "=");
           if (p != NULL)
-            attack_mess[mess][level].buf3 = strdup_local (p);
+            attack_mess[mess][level].buf3 = strdup (p);
           else
-            attack_mess[mess][level].buf3 = strdup_local ("");
+            attack_mess[mess][level].buf3 = strdup ("");
           mode = 1;
           level++;
           total++;