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

Comparing deliantra/server/server/init.C (file contents):
Revision 1.42 by root, Tue Mar 6 03:10:11 2007 UTC vs.
Revision 1.64 by root, Tue Apr 22 23:50:24 2008 UTC

 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
 #include <material.h>
 #include <loader.h>
   {"-detach", 0, 2, set_daemon},
 /* Start of pass 3 information. In theory, by pass 3, all data paths
  * and defaults should have been set up.
  */
-  {"-o", 0, 3, compile_info},
   {"-m", 0, 3, set_dumpmon1},
   {"-m2", 0, 3, set_dumpmon2},
   {"-m3", 0, 3, set_dumpmon3},
   {"-m4", 0, 3, set_dumpmon4},
   {"-m5", 0, 3, set_dumpmon5},
   {"-m6", 0, 3, set_dumpmon6},
   {"-m7", 0, 3, set_dumpmon7},
   {"-m8", 0, 3, set_dumpmon8},
   {"-m9", 0, 3, set_dumpmon9},
   {"-mt", 1, 3, (void (*)()) set_dumpmont},
-  {"-mexp", 0, 3, dump_experience},
   {"-s", 0, 3, showscores},
   {"-score", 1, 3, (void (*)()) showscoresparm}
 };
 /* Note since this may be called before the library has been set up,
- * we don't use any of crossfires built in logging functions.
+ * we don't use any of deliantras built in logging functions.
  */
 static void
 parse_args (int argc, char *argv[], int pass)
 {
   size_t i;
   mt = get_empty_mat ();
   materialt = mt;
   for (;;)
     {
+      thawer.next ();
-      switch (thawer.get_kv ())
+      switch (thawer.kw)
         {
           case KW_name:
             /* clean up the previous entry */
             if (mt->next)
               {
   /* We don't require a settings file at current time, but down the road,
    * there will probably be so many values that not having a settings file
    * will not be a good thing.
    */
-  if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
+  if (!(fp = open_and_uncompress (buf, 0, &comp)))
     {
-      LOG (llevError, "Warning: No settings file found\n");
+      LOG (llevError, "Error: No settings file found\n");
-      return;
+      exit (1);
     }
   while (fgets (buf, MAX_BUF - 1, fp) != NULL)
     {
       if (buf[0] == '#')
         continue;
       /* eliminate newline */
             *cp++ = 0;
           has_val = 1;
         }
       else
         {
-          cp = "";
+          cp = (char *)"";
           has_val = 0;
         }
       if (!strcasecmp (buf, "motd"))
         {
           else
             {
               LOG (llevError, "load_settings: Unknown value for " "spell_failure_effects: %s\n", cp);
             }
         }
-      else if (!strcasecmp (buf, "casting_time"))
-        {
-          if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
-            {
-              settings.casting_time = TRUE;
-            }
-          else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
-            {
-              settings.casting_time = FALSE;
-            }
-          else
-            {
-              LOG (llevError, "load_settings: Unknown value for " "casting_time: %s\n", cp);
-            }
-        }
-      else if (!strcasecmp (buf, "real_wiz"))
-        {
-          if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
-            {
-              settings.real_wiz = TRUE;
-            }
-          else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
-            {
-              settings.real_wiz = FALSE;
-            }
-          else
-            {
-              LOG (llevError, "load_settings: Unknown value for " "real_wiz: %s\n", cp);
-            }
-        }
       else if (!strcasecmp (buf, "spellpoint_level_depend"))
         {
           if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
             {
               settings.spellpoint_level_depend = TRUE;
         }
       else if (!strcasecmp (buf, "set_friendly_fire"))
         {
           int val = atoi (cp);
-#if COZY_SERVER
           if (val < 0 || val > 100)
             LOG (llevError, "load_settings: set_friendly_fire must be between 0 an 100" ", %d is invalid\n", val);
-#else
-          if (val < 1 || val > 100)
-            LOG (llevError, "load_settings: set_friendly_fire must be between 1 an 100" ", %d is invalid\n", val);
-#endif
           else
             settings.set_friendly_fire = val;
         }
       else if (!strcasecmp (buf, "armor_max_enchant"))
         {
             {
               LOG (llevError, "load_settings: unknown value for armor_speed_linear: %s\n", cp);
             }
         }
-      else if (!strcasecmp (buf, "no_player_stealing"))
-        {
-          if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
-            {
-              settings.no_player_stealing = TRUE;
-            }
-          else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
-            {
-              settings.no_player_stealing = FALSE;
-            }
-          else
-            {
-              LOG (llevError, "load_settings: unknown value for no_player_stealing: %s\n", cp);
-            }
-        }
-      else if (!strcasecmp (buf, "create_home_portals"))
-        {
-          if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
-            {
-              settings.create_home_portals = TRUE;
-            }
-          else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
-            {
-              settings.create_home_portals = FALSE;
-            }
-          else
-            {
-              LOG (llevError, "load_settings: Unknown value for create_home_portals: %s\n", cp);
-            }
-        }
       else
-        {
-          LOG (llevError, "Unknown value in settings file: %s\n", buf);
+        LOG (llevError, "Unknown value in settings file: %s\n", buf);
-        }
     }
   close_and_delete (fp, comp);
 }
 /*
  * init() is called only once, when starting the program.
  */
 void
 init (int argc, char **argv)
 {
   init_done = 0;                /* Must be done before init_signal() */
   rndm.seed (time (0));
-  logfile = stderr;
   init_environ ();
   parse_args (argc, argv, 1);   /* First arg pass - right now it does
                                  * nothing, but in future specifying the
                                  * LibDir in this pass would be reasonable*/
+  init_anim ();                 // Must be called before perl
+  init_globals ();
+  init_experience ();
+  init_attackmess ();
+  init_dynamic ();
+  init_block ();
   cfperl_init ();
-  init_library ();              /* Must be called early */
   load_settings ();             /* Load the settings file */
   load_materials ();
   parse_args (argc, argv, 2);
-  fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION);
+  LOG (llevInfo, "Welcome to Deliantra, v" VERSION);
-  fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n");
+  LOG (llevInfo, "Copyright (C) Marc Alexander Lehmann / Robin Redeker / the Deliantra team.");
-  fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n");
+  LOG (llevInfo, "Copyright (C) 1994 Mark Wedel.");
-  fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n");
+  LOG (llevInfo, "Copyright (C) 1992 Frank Tore Johansen.");
   if (strcmp (settings.dm_mail, "") != 0)
     {
-      fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail);
+      LOG (llevInfo, "Maintained locally by: %s\n", settings.dm_mail);
-      fprintf (logfile, "Questions and bugs should be mailed to above address.\n");
+      LOG (llevInfo, "Questions and bugs should be mailed to above address.\n");
     }
-  init_startup ();              /* Write (C), check shutdown/forbid files */
+  UUID::init ();
-  init_uuid ();
   init_signals ();              /* Sets up signal interceptions */
   init_commands ();             /* Sort command tables */
   init_skills ();
   parse_args (argc, argv, 3);
-  if (settings.daemonmode)
-    logfile = BecomeDaemon (settings.logfilename[0] == '\0' ? "logfile" : settings.logfilename);
   init_beforeplay ();
-  init_ericserver ();
   init_done = 1;
 }
 void
 usage (void)
 {
-  (void) fprintf (logfile, "Usage: crossfire [-h] [-<flags>]...\n");
+  fprintf (stderr, "Usage: deliantra-server [-h] [-<flags>]...\n");
 }
 void
 help (void)
 {
 }
 void
 init_beforeplay (void)
 {
-  init_archetypes ();           /* If not called before, reads all archetypes from file */
   init_artifacts ();            /* If not called before, reads all artifacts from file */
-  init_spells ();               /* If not called before, links archtypes used by spells */
-  init_regions ();              /* If not called before, reads all regions from file */
-  init_archetype_pointers ();   /* Setup global pointers to archetypes */
   init_races ();                /* overwrite race designations using entries in lib/races file */
   init_gods ();                 /* init linked list of gods from archs */
   init_readable ();             /* inits useful arrays for readable texts */
   init_formulae ();             /* If not called before, reads formulae from file */
-  switch (settings.dumpvalues)
-    {
-      case 1:
-        print_monsters ();
-        exit (0);
-      case 2:
-        dump_abilities ();
-        exit (0);
-      case 3:
-        dump_artifacts ();
-        exit (0);
-      case 4:
-        dump_spells ();
-        exit (0);
-      case 5:
-        exit (0);
-      case 6:
-        dump_races ();
-        exit (0);
-      case 7:
-        dump_alchemy ();
-        exit (0);
-      case 9:
-        dump_alchemy_costs ();
-        exit (0);
-      case 10:
-        dump_monster_treasure (settings.dumparg);
-        exit (0);
-    }
-}
-void
-init_startup (void)
-{
-  char buf[MAX_BUF];
-  FILE *fp;
-  int comp;
-#ifdef SHUTDOWN_FILE
-  sprintf (buf, "%s/%s", settings.confdir, SHUTDOWN_FILE);
-  if ((fp = open_and_uncompress (buf, 0, &comp)) != NULL)
-    {
-      while (fgets (buf, MAX_BUF - 1, fp) != NULL)
-        printf ("%s", buf);
-      close_and_delete (fp, comp);
-      exit (1);
-    }
-#endif
-  if (forbid_play ())
-    {                           /* Maybe showing highscore should be allowed? */
-      LOG (llevError, "CrossFire: Playing not allowed.\n");
-      exit (-1);
-    }
-}
-/*
- * compile_info(): activated with the -o flag.
- * It writes out information on how Imakefile and config.h was configured
- * at compile time.
- */
-void
-compile_info (void)
-{
-  int i = 0;
-  printf ("Non-standard include files:\n");
-#if !defined (__STRICT_ANSI__) || defined (__sun__)
-# if !defined (Mips)
-  printf ("<stdlib.h>\n");
-  i = 1;
-# endif
-# if !defined (MACH) && !defined (sony)
-  printf ("<malloc.h>\n");
-  i = 1;
-# endif
-#endif
-#ifndef __STRICT_ANSI__
-# ifndef MACH
-  printf ("<memory.h\n");
-  i = 1;
-# endif
-#endif
-#ifndef sgi
-  printf ("<sys/timeb.h>\n");
-  i = 1;
-#endif
-  if (!i)
-    printf ("(none)\n");
-  printf ("Datadir:\t\t%s\n", settings.datadir);
-  printf ("Localdir:\t\t%s\n", settings.localdir);
-#ifdef PERM_FILE
-  printf ("Perm file:\t<ETC>/%s\n", PERM_FILE);
-#endif
-#ifdef SHUTDOWN_FILE
-  printf ("Shutdown file:\t<ETC>/%s\n", SHUTDOWN_FILE);
-#endif
-  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);
-#ifdef USE_CALLOC
-  printf ("Use_calloc:\t<true>\n");
-#else
-  printf ("Use_calloc:\t<false>\n");
-#endif
-#ifdef X_EDITOR
-  printf ("Editor:\t\t%s\n", X_EDITOR);
-#endif
-  printf ("Max_time:\t%d\n", MAX_TIME);
-  execl ("/bin/uname", "uname", "-a", NULL);
-  LOG (llevError, "Oops, shouldn't have gotten here: execl(/bin/uname) failed: %s\n", strerror (errno));
-  exit (-1);
 }
 /* Signal handlers: */
-void
+static void
 rec_sigabrt (int i)
 {
   signal (SIGABRT, SIG_DFL);
   LOG (llevError, "SIGABRT received.\n");
   cleanup ("SIGABRT received", 1);
 }
-void
+static void
 rec_sigsegv (int i)
 {
   signal (SIGSEGV, SIG_DFL);
   LOG (llevError, "SIGSEGV received.\n");
   cleanup ("SIGSEGV received", 1);
 }
-void
+static void
 rec_sigquit (int i)
 {
   signal (SIGQUIT, SIG_IGN);
   LOG (llevInfo, "SIGQUIT received\n");
   cleanup ("SIGQUIT received", 1);
 }
-void
+static void
 rec_sigbus (int i)
 {
   signal (SIGBUS, SIG_DFL);
   LOG (llevError, "SIGBUS received\n");
   cleanup ("SIGBUS received", 1);
+}
+void
+reset_signals ()
+{
+  signal (SIGABRT, SIG_DFL);
+  signal (SIGQUIT, SIG_DFL);
+  signal (SIGSEGV, SIG_DFL);
+  signal (SIGBUS , SIG_DFL);
+  signal (SIGINT , SIG_DFL);
+  signal (SIGTERM, SIG_DFL);
 }
 void
 init_signals (void)
 {
   sigaltstack (&ss, 0);
   struct sigaction sa;
   sigfillset (&sa.sa_mask);
-  sa.sa_flags = SA_ONSTACK | SA_RESTART;
+  sa.sa_flags = SA_RESTART;
   sa.sa_handler = SIG_IGN;     sigaction (SIGPIPE, &sa, 0);
   sa.sa_handler = rec_sigabrt; sigaction (SIGABRT, &sa, 0);
   sa.sa_handler = rec_sigquit; sigaction (SIGQUIT, &sa, 0);
+  sa.sa_handler = rec_sigbus;  sigaction (SIGBUS,  &sa, 0);
+  sa.sa_flags |= SA_ONSTACK;
   sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0);
-  sa.sa_handler = rec_sigbus;  sigaction (SIGBUS,  &sa, 0);
 }
 /* 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
           /* set creature race to race value */
           if ((mon = archetype::find (cp)) == NULL)
             LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
           else
             {
-              if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race)))
+              if (set_race && (!mon->race || strcmp (mon->race, race)))
                 {
-                  if (mon->clone.race)
+                  if (mon->race)
-                    LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->clone.race, &mon->name);
+                    LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname);
-                  mon->clone.race = race;
+                  mon->race = race;
                 }
               /* if the arch is a monster, add it to the race list */
-              if (set_list && QUERY_FLAG (&mon->clone, FLAG_MONSTER))
+              if (set_list && QUERY_FLAG (mon, FLAG_MONSTER))
-                add_to_racelist (race, &mon->clone);
+                add_to_racelist (race, mon);
             }
         }
     }
   fclose (file);
   for (list = first_race; list; list = list->next)
     {
       fprintf (stderr, "\nRACE %s:\t", &list->name);
       for (tmp = list->member; tmp; tmp = tmp->next)
-        fprintf (stderr, "%s(%d), ", &tmp->ob->arch->name, tmp->ob->level);
+        fprintf (stderr, "%s(%d), ", &tmp->ob->arch->archname, tmp->ob->level);
     }
   fprintf (stderr, "\n");
 }

Diff Legend

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

Comparing deliantra/server/server/init.C (file contents): Revision 1.42 by root, Tue Mar 6 03:10:11 2007 UTC vs. Revision 1.64 by root, Tue Apr 22 23:50:24 2008 UTC

Diff Legend

Comparing deliantra/server/server/init.C (file contents):
Revision 1.42 by root, Tue Mar 6 03:10:11 2007 UTC vs.
Revision 1.64 by root, Tue Apr 22 23:50:24 2008 UTC