--- deliantra/server/common/init.C	2006/09/14 18:13:01	1.12
+++ 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)
             {
@@ -432,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;
         }
@@ -444,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;
         }
@@ -456,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++;