[ViewVC] Diff of: cvs/deliantra/server/server/init.C

Comparing deliantra/server/server/init.C (file contents):
Revision 1.21 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.33 by root, Sat Jan 13 23:45:46 2007 UTC

 /*
     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
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 */
 #include <global.h>
 #include <material.h>
 #include <loader.h>
-#ifndef __CEXTRACT__
-# include <sproto.h>
+#include <sproto.h>
-#endif
-/* global weathermap */
-weathermap_t **weathermap;
 void
 set_logfile (char *val)
 {
   settings.logfilename = val;
  * pass system very easy, and it is very easy to add in new options.
  */
 struct Command_Line_Options options[] = {
 /* Pass 1 functions - STuff that can/should be called before we actually
- * initialize any data.
+ * initialise any data.
  */
   {"-h", 0, 1, help},
 /* Honor -help also, since it is somewhat common */
   {"-help", 0, 1, help},
   FILE *fp;
   materialtype_t *mt;
   int i, value;
   sprintf (filename, "%s/materials", settings.datadir);
-  LOG (llevDebug, "Reading material type data from %s...", filename);
+  LOG (llevDebug, "Reading material type data from %s...\n", filename);
   if ((fp = fopen (filename, "r")) == NULL)
     {
       LOG (llevError, "Cannot open %s for reading\n", filename);
       mt = get_empty_mat ();
       mt->next = NULL;
           else
             {
               LOG (llevError, "load_settings: Unknown value for " "real_wiz: %s\n", cp);
             }
         }
-      else if (!strcasecmp (buf, "explore_mode"))
-        {
-          if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
-            {
-              settings.explore_mode = TRUE;
-            }
-          else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
-            {
-              settings.explore_mode = FALSE;
-            }
-          else
-            {
-              LOG (llevError, "load_settings: Unknown value for " "explore_mode: %s\n", cp);
-            }
-        }
       else if (!strcasecmp (buf, "spellpoint_level_depend"))
         {
           if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
             {
               settings.spellpoint_level_depend = TRUE;
                                  * LibDir in this pass would be reasonable*/
   cfperl_init ();
   init_library ();              /* Must be called early */
   load_settings ();             /* Load the settings file */
-  init_weather ();
   load_materials ();
   parse_args (argc, argv, 2);
   fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION);
+  fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n");
   fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n");
   fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n");
   if (strcmp (settings.dm_mail, "") != 0)
     {
   init_startup ();              /* Write (C), check shutdown/forbid files */
   init_uuid ();
   init_signals ();              /* Sets up signal interceptions */
   init_commands ();             /* Sort command tables */
-  read_map_log ();              /* Load up the old temp map files */
   init_skills ();
   parse_args (argc, argv, 3);
   if (settings.daemonmode)
   printf ("Save player:\t<true>\n");
   printf ("Save mode:\t%4.4o\n", SAVE_MODE);
   printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir);
   printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir);
   printf ("Tmpdir:\t\t%s\n", settings.tmpdir);
-  printf ("Map max timeout:\t%d\n", MAP_MAXTIMEOUT);
-  printf ("Max objects:\t%d\n", MAX_OBJECTS);
 #ifdef USE_CALLOC
   printf ("Use_calloc:\t<true>\n");
 #else
   printf ("Use_calloc:\t<false>\n");
 #endif
 }
 /* Signal handlers: */
 void
+rec_sigabrt (int i)
+{
+  signal (SIGABRT, SIG_DFL);
+  LOG (llevError, "SIGABRT received.\n");
+  cleanup ("SIGABRT received", 1);
+}
+void
 rec_sigsegv (int i)
 {
+  signal (SIGSEGV, SIG_DFL);
   LOG (llevError, "SIGSEGV received.\n");
-  fatal_signal (1, 1);
+  cleanup ("SIGSEGV received", 1);
-}
-void
-rec_sigint (int i)
-{
-  LOG (llevInfo, "SIGINT received.\n");
-  fatal_signal (0, 1);
-}
-void
-rec_sighup (int i)
-{
-  LOG (llevInfo, "SIGHUP received\n");
-  if (init_done)
-    cleanup ();
-  exit (0);
 }
 void
 rec_sigquit (int i)
 {
+  signal (SIGQUIT, SIG_IGN);
   LOG (llevInfo, "SIGQUIT received\n");
-  fatal_signal (1, 1);
+  cleanup ("SIGQUIT received", 1);
 }
 void
 rec_sigbus (int i)
 {
-#ifdef SIGBUS
+  signal (SIGBUS, SIG_DFL);
   LOG (llevError, "SIGBUS received\n");
-  fatal_signal (1, 1);
+  cleanup ("SIGBUS received", 1);
-#endif
-}
-void
-rec_sigterm (int i)
-{
-  LOG (llevInfo, "SIGTERM received\n");
-  fatal_signal (0, 1);
-}
-void
-fatal_signal (int make_core, int close_sockets)
-{
-  cleanup (make_core);
 }
 void
 init_signals (void)
 {
-  signal (SIGHUP, rec_sighup);
+  signal (SIGPIPE, SIG_IGN);
-  signal (SIGINT, rec_sigint);
+  signal (SIGABRT, rec_sigabrt);
   signal (SIGQUIT, rec_sigquit);
   signal (SIGSEGV, rec_sigsegv);
-  signal (SIGPIPE, SIG_IGN);
-#ifdef SIGBUS
-  signal (SIGBUS, rec_sigbus);
+  signal (SIGBUS,  rec_sigbus);
-#endif
-  signal (SIGTERM, rec_sigterm);
 }
 /* init_races() - reads the races file in the lib/ directory, then
  * overwrites old 'race' entries. This routine allow us to quickly
  * re-configure the 'alignment' of monsters, objects. Useful for
  * putting together lists of creatures, etc that belong to gods.
  */
 void
 init_races (void)
 {
   FILE *file;
   char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF];
     return;
   init_done = 1;
   first_race = 0;
   sprintf (fname, "%s/races", settings.datadir);
-  LOG (llevDebug, "Reading races from %s...", fname);
+  LOG (llevDebug, "Reading races from %s...\n", fname);
   if (!(file = fopen (fname, "r")))
     {
       LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno));
       return;
     }
           if (cp[strlen (cp) - 1] == '\n')
             cp[strlen (cp) - 1] = '\0';
           /* set creature race to race value */
           if ((mon = archetype::find (cp)) == NULL)
-            LOG (llevError, "\nCreature %s in race file lacks archetype", cp);
+            LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
           else
             {
               if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race)))
                 {
                   if (mon->clone.race)
-                    LOG (llevDebug, "\n Resetting race to %s from %s for archetype %s", race, &mon->clone.race, &mon->name);
+                    LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->clone.race, &mon->name);
                   mon->clone.race = race;
                 }
               /* if the arch is a monster, add it to the race list */

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/init.C (file contents): Revision 1.21 by root, Wed Dec 20 09:14:22 2006 UTC vs. Revision 1.33 by root, Sat Jan 13 23:45:46 2007 UTC

Diff Legend

Comparing deliantra/server/server/init.C (file contents):
Revision 1.21 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.33 by root, Sat Jan 13 23:45:46 2007 UTC