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

Comparing deliantra/server/server/init.C (file contents):
Revision 1.49 by root, Wed May 2 03:55:41 2007 UTC vs.
Revision 1.56 by root, Sun Jul 1 05:00:20 2007 UTC

 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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
+ * Crossfire TRT 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 <crossfire@schmorp.de>
  */
 #include <global.h>
 #include <material.h>
 #include <loader.h>
   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)
               {
           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_skills ();
   parse_args (argc, argv, 3);
   init_beforeplay ();
-  init_ericserver ();
   init_done = 1;
 }
 void
 usage (void)
   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)
 {
           /* 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.49 by root, Wed May 2 03:55:41 2007 UTC vs. Revision 1.56 by root, Sun Jul 1 05:00:20 2007 UTC

Diff Legend

Comparing deliantra/server/server/init.C (file contents):
Revision 1.49 by root, Wed May 2 03:55:41 2007 UTC vs.
Revision 1.56 by root, Sun Jul 1 05:00:20 2007 UTC