--- deliantra/server/common/init.C	2006/09/10 16:00:23	1.10
+++ deliantra/server/common/init.C	2006/09/14 22:33:58	1.13
@@ -1,9 +1,3 @@
-
-/*
- * static char *rcsid_init_c =
- *   "$Id: init.C,v 1.10 2006/09/10 16:00:23 root Exp $";
- */
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -24,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
@@ -33,33 +27,33 @@
 #include <object.h>
 
 extern const char *const attacktype_desc[NROFATTACKS] = {
-#define def(uc, lc, name, plus, change) # name,
-#include "attackinc.h"
-#undef def
+# define def(uc, lc, name, plus, change) # name,
+#  include "attackinc.h"
+# undef def
 };
 
 extern const keyword resist_save[NROFATTACKS] = {
-#define def(uc, lc, name, plus, change) KW_resist_ ## lc,
-#include "attackinc.h"
-#undef def
+# 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"
-#undef def
+# define def(uc, lc, name, plus, change) # plus,
+#  include "attackinc.h"
+# undef def
 };
 
 extern const char *const change_resist_msg[NROFATTACKS] = {
-#define def(uc, lc, name, plus, change) # change,
-#include "attackinc.h"
-#undef def
+# define def(uc, lc, name, plus, change) # change,
+#  include "attackinc.h"
+# undef def
 };
 
 int resist_table[NROFATTACKS] = {
-#define def(uc, lc, name, plus, change) ATNR_ ## uc,
-#include "attackinc.h"
-#undef def
+# define def(uc, lc, name, plus, change) ATNR_ ## uc,
+#  include "attackinc.h"
+# undef def
 };
 
 /* You unforunately need to looking in include/global.h to see what these
@@ -222,7 +216,6 @@
 {
   init_environ ();
   init_globals ();
-  init_objects ();
   init_vars ();
   init_block ();
   ReadBmapNames ();
@@ -285,66 +278,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)
 {
@@ -355,17 +298,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);
 }