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

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.65 by root, Thu Jun 10 06:03:18 2010 UTC vs.
Revision 1.74 by root, Sat Nov 17 23:40:03 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by 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
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /* Oct 3, 1995 - Code laid down for initial gods, priest alignment, and
  * monster race initialization. b.t.
   return 0;
 }
 /**
  * Returns a string that is the name of the god that should be natively worshipped by a
  * creature of who has race *race
  * if we can't find a god that is appropriate, we return NULL
  */
 static shstr_tmp
 get_god_for_race (shstr_cmp race)
 }
 /**
  * Determines if op worships a god.
  * Returns the godname if they do or "none" if they have no god.
  * In the case of an NPC, if they have no god, we try and guess
  * who they should worship based on their race. If that fails we
  * give them a random one.
  */
 shstr_tmp
 determine_god (object *op)
 {
         follower_remove_similar_item (this, tr->item);
   if (!new_god)
     return;
-  if (new_god->slaying && race.contains (new_god->slaying))
+  if (new_god->slaying && new_god->slaying.contains (race))
     {
       failmsgf ("Fool! %s detests your kind! H<This god does not accept followers of your race.>", &new_god->name);
       if (random_roll (0, level - 1, this, PREFER_LOW) - 5 > 0)
         {
-          object *tmp = get_archetype (LOOSE_MANA);
+          object *tmp = archetype::get (LOOSE_MANA);
           cast_magic_storm (this, tmp, new_god->level + 10);
         }
       return;
   skop->path_denied = new_god->path_denied;
   /* copy god's resistances */
   memcpy (skop->resist, new_god->resist, sizeof (new_god->resist));
   /* make sure that certain immunities do NOT get passed
    * to the follower!
    */
   for (i = 0; i < NROFATTACKS; i++)
     if (skop->resist[i] > 30 && (i == ATNR_FIRE || i == ATNR_COLD || i == ATNR_ELECTRICITY || i == ATNR_POISON))
       skop->resist[i] = 30;
   if (!op->contr)
     return 0;
   object *weapon = op->contr->combat_ob;
+  if (!weapon)
+    return 0;
   if (weapon->type != WEAPON && weapon->type != BOW)
     return 0;
   if (god_examines_item (god, weapon) <= 0)
     return 0;
       change_exp (op, -random_roll (0, loss * angry - 1, op, PREFER_LOW), skop ? skop->skill : shstr_none, SK_SUBTRACT_SKILL_EXP);
       if (random_roll (0, angry, op, PREFER_LOW))
         {
-          object *tmp = get_archetype (LOOSE_MANA);
+          object *tmp = archetype::get (LOOSE_MANA);
           cast_magic_storm (op, tmp, op->level + (angry * 3));
         }
       new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "%s becomes angry and punishes you!", &god->name);
   return reaction;
 }
 /**
  * Every once in a while the god will intervene to help the worshiper.
  * Later, this fctn can be used to supply quests, etc for the
  * priest. -b.t.
  * called from pray_at_altar() currently.
  */
 static void
 god_intervention (object *op, object *god, object *skill)
 {
   treasure *tr;
           if (op->stats.grace < item->stats.grace || op->stats.grace < op->stats.maxgrace)
             {
               /* Follower lacks the required grace for the following
                * treasure list items. */
-              object *tmp = get_archetype (HOLY_POSSESSION);
+              object *tmp = archetype::get (HOLY_POSSESSION);
               cast_change_ability (op, op, tmp, 0, 1);
               tmp->destroy ();
               return;
             }
               object *tmp;
               /* you really screwed up */
               angry = 3;
               new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, pl, "Foul Priest! %s punishes you!", &pl_god->name);
-              tmp = get_archetype (LOOSE_MANA);
+              tmp = archetype::get (LOOSE_MANA);
               cast_magic_storm (pl, tmp, pl_god->level + 20);
             }
           else
             new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, pl, "Foolish heretic! %s is livid!", &pl_god->name);
         }
       else
         new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, pl, "Heretic! %s is angered!", &pl_god->name);
       /* whether we will be successfull in defecting or not -
        * we lose experience from the clerical experience obj
        */
       loss = angry * (skill->stats.exp / 10);
       if (loss)
         change_exp (pl, -random_roll64 (0, loss, pl, PREFER_LOW), skill ? skill->skill : shstr_none, SK_SUBTRACT_SKILL_EXP);
       /* May switch Gods, but its random chance based on our current level
        * note it gets harder to swap gods the higher we get
        */
       if ((angry == 1) && !(random_roll (0, skill->level, pl, PREFER_LOW)))
         pl->become_follower (altar->other_arch);
       else
         {

Diff Legend

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

Comparing deliantra/server/server/gods.C (file contents): Revision 1.65 by root, Thu Jun 10 06:03:18 2010 UTC vs. Revision 1.74 by root, Sat Nov 17 23:40:03 2018 UTC

Diff Legend

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.65 by root, Thu Jun 10 06:03:18 2010 UTC vs.
Revision 1.74 by root, Sat Nov 17 23:40:03 2018 UTC