--- deliantra/server/common/init.C	2006/12/18 02:35:00	1.17
+++ deliantra/server/common/init.C	2006/12/30 10:16:10	1.18
@@ -97,7 +97,6 @@
   "news",
   "",                           /* DM_MAIL */
   0, 0, 0, 0, 0, 0, 0, 0,       /* worldmap settings */
-  EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y,
   0,
   1.0,
 
@@ -138,56 +137,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 (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.
@@ -196,7 +145,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)
 {
@@ -211,7 +159,6 @@
   init_dynamic ();
   init_attackmess ();
   init_clocks ();
-  init_emergency_mappath ();
   init_experience ();
 }