--- deliantra/server/common/init.C	2006/09/13 02:05:18	1.11
+++ deliantra/server/common/init.C	2006/12/18 02:35:00	1.17
@@ -18,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 #define EXTERN                  // horrible hack
@@ -32,12 +32,6 @@
 # undef def
 };
 
-extern const keyword resist_save[NROFATTACKS] = {
-# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
-#  include "attackinc.h"
-# undef def
-};
-
 extern const char *const resist_plus[NROFATTACKS] = {
 # define def(uc, lc, name, plus, change) # plus,
 #  include "attackinc.h"
@@ -95,21 +89,13 @@
   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,
@@ -179,7 +165,7 @@
           if (online == 0)
             {
               tmpbuf[strlen (tmpbuf) - 1] = 0;  /* kill newline */
-              settings.emergency_mapname = strdup_local (tmpbuf);
+              settings.emergency_mapname = strdup (tmpbuf);
             }
           else if (online == 1)
             {
@@ -216,7 +202,6 @@
 {
   init_environ ();
   init_globals ();
-  init_objects ();
   init_vars ();
   init_block ();
   ReadBmapNames ();
@@ -279,66 +264,16 @@
 init_globals (void)
 {
   if (settings.logfilename[0] == 0)
-    {
-      logfile = stderr;
-    }
+    logfile = stderr;
   else if ((logfile = fopen (settings.logfilename, "a")) == NULL)
     {
       fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename);
       logfile = stderr;
     }
   else
-    {
-      setvbuf (logfile, NULL, _IOLBF, 0);
-    }
-  exiting = 0;
-  first_player = NULL;
-  first_friendly_object = NULL;
-  first_map = NULL;
-  first_treasurelist = NULL;
-  first_artifactlist = NULL;
-  first_archetype = NULL;
-  *first_map_ext_path = 0;
-  warn_archetypes = 0;
-  nroftreasures = 0;
-  nrofartifacts = 0;
-  nrofallowedstr = 0;
-  ring_arch = NULL;
-  amulet_arch = NULL;
-  staff_arch = NULL;
-  trying_emergency_save = 0;
-  num_animations = 0;
-  animations_allocated = 0;
-  init_defaults ();
+    setvbuf (logfile, NULL, _IOLBF, 0);
 }
 
-/*
- * Sets up and initialises the linked list of free and used objects.
- * Allocates a certain chunk of objects and puts them on the free list.
- * Called by init_library();
- */
-
-void
-init_objects (void)
-{
-  /* Initialize all objects: */
-  objects = NULL;
-  active_objects = NULL;
-}
-
-/*
- * Initialises global variables which can be changed by options.
- * Called by init_library().
- */
-
-void
-init_defaults (void)
-{
-  editor = 0;
-  nroferrors = 0;
-}
-
-
 void
 init_dynamic (void)
 {
@@ -349,17 +284,18 @@
       if (at->clone.type == MAP)
         {
           if (at->clone.race)
-            {
-              strcpy (first_map_ext_path, at->clone.race);
-            }
+            strcpy (first_map_ext_path, at->clone.race);
+
           if (EXIT_PATH (&at->clone))
             {
               strcpy (first_map_path, EXIT_PATH (&at->clone));
               return;
             }
         }
+
       at = at->next;
     }
+
   LOG (llevDebug, "You Need a archetype called 'map' and it have to contain start map\n");
   exit (-1);
 }
@@ -482,9 +418,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;
         }
@@ -494,9 +430,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;
         }
@@ -506,9 +442,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++;