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

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.18 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs.
Revision 1.23 by root, Tue May 22 10:50:01 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  *
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (C) 1992 Frank Tore Johansen
  *
       /* 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)))
-        {
-          become_follower (pl, &altar->other_arch->clone);
+        become_follower (pl, &altar->other_arch->clone);
-        }
       else
         {
           /* toss this player off the altar.  He can try again. */
           new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, pl, "A divine force pushes you off the altar.");
+          pl->contr->fire_on = 0;
+          pl->speed_left = 1.f;
           move_player (pl, absdir (pl->facing + 4));    /* back him off the way he came. */
         }
     }
 }
         {
           object *item;
           if (!tr->item)
             continue;
           item = &tr->item->clone;
           /* Basically, see if the matching spell is granted by this god. */
           if (tr->item->clone.type == SPELL && tr->item->clone.name == tmp->name)
         }
     }
   /* remove any godgiven items from the old god */
   if (old_god)
-    {
-      for (tr = old_god->randomitems->items; tr != NULL; tr = tr->next)
+    for (tr = old_god->randomitems->items; tr; tr = tr->next)
-        {
-          if (tr->item && QUERY_FLAG (&tr->item->clone, FLAG_STARTEQUIP))
+      if (tr->item && QUERY_FLAG (&tr->item->clone, FLAG_STARTEQUIP))
-            follower_remove_similar_item (op, &tr->item->clone);
+        follower_remove_similar_item (op, &tr->item->clone);
-        }
-    }
   if (!op || !new_god)
     return;
   if (op->race && new_god->slaying && strstr (op->race, new_god->slaying))
     {
       new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "Fool! %s detests your kind!", &new_god->name);
       if (random_roll (0, op->level - 1, op, PREFER_LOW) - 5 > 0)
         {
           object *tmp = get_archetype (LOOSE_MANA);
           cast_magic_storm (op, tmp, new_god->level + 10);
         }
       return;
     }
   /* give the player any special god-characteristic-items. */
-  for (tr = new_god->randomitems->items; tr != NULL; tr = tr->next)
+  for (tr = new_god->randomitems->items; tr; tr = tr->next)
     {
-      if (tr->item && tr->item->clone.invisible && tr->item->clone.type != SPELLBOOK &&
+      if (tr->item && tr->item->clone.invisible && tr->item->clone.type != SPELLBOOK
-          tr->item->clone.type != BOOK && tr->item->clone.type != SPELL)
+          && tr->item->clone.type != BOOK && tr->item->clone.type != SPELL)
         god_gives_present (op, new_god, tr);
     }
   new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You become a follower of %s!", &new_god->name);
     {
       LOG (llevError, "BUG: determine_holy_arch(): no god or god without " "randomitems\n");
       return NULL;
     }
-  for (tr = god->randomitems->items; tr != NULL; tr = tr->next)
+  for (tr = god->randomitems->items; tr; tr = tr->next)
     {
-      object *item;
       if (!tr->item)
         continue;
-      item = &tr->item->clone;
+      object *item = &tr->item->clone;
       if (item->type == BOOK && item->invisible && strcmp (item->name, type) == 0)
         return item->other_arch;
     }
   return NULL;
   if (level <= 20)
     return level / difficulty;
   if (level <= 40)
     return (20 + (level - 20) / 2) / difficulty;
   return (30 + (level - 40) / 4) / difficulty;
 }
 /**
  * God wants to enchant weapon.
   int tmp;
   for (weapon = op->inv; weapon; weapon = weapon->below)
     if ((weapon->type == WEAPON || weapon->type == BOW) && QUERY_FLAG (weapon, FLAG_APPLIED))
       break;
   if (weapon == NULL || god_examines_item (god, weapon) <= 0)
     return 0;
   /* First give it a title, so other gods won't touch it */
   if (!weapon->title)
   if (god_examines_priest (op, god) < 0)
     return;
   new_draw_info (NDI_UNIQUE, 0, op, "You feel a holy presence!");
-  for (tr = god->randomitems->items; tr != NULL; tr = tr->next)
+  for (tr = god->randomitems->items; tr; tr = tr->next)
     {
       object *item;
       if (tr->chance <= random_roll (0, 99, op, PREFER_HIGH))
         continue;
       /* Treasurelist - generate some treasure for the follower */
       if (tr->name)
         {
-          treasurelist *tl = find_treasurelist (tr->name);
+          treasurelist *tl = treasurelist::find (tr->name);
           if (tl == NULL)
             continue;
           new_draw_info (NDI_UNIQUE, 0, op, "Something appears before your " "eyes.  You catch it before it falls to the ground.");
             continue;
           new_draw_info (NDI_UNIQUE, 0, op, "Shimmering light surrounds and restores you!");
           for (i = 0; i < NUM_STATS; i++)
-            if (get_attr_value (&depl->stats, i))
+            if (depl->stats.stat (i))
               new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
           depl->destroy ();
           op->update_stats ();
           return;

Diff Legend

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

Comparing deliantra/server/server/gods.C (file contents): Revision 1.18 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs. Revision 1.23 by root, Tue May 22 10:50:01 2007 UTC

Diff Legend

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.18 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs.
Revision 1.23 by root, Tue May 22 10:50:01 2007 UTC