[ViewVC] Diff of: cvs/deliantra/server/server/spell

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.42 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.44 by root, Tue May 15 16:45:23 2007 UTC

  ****************************************************************************/
 void
 regenerate_rod (object *rod)
 {
   if (rod->stats.hp < rod->stats.maxhp)
-    {
+    rod->stats.hp = min (rod->stats.maxhp, rod->stats.hp + 1 + rod->stats.maxhp / 10);
-      rod->stats.hp += 1 + rod->stats.maxhp / 10;
-      if (rod->stats.hp > rod->stats.maxhp)
-        rod->stats.hp = rod->stats.maxhp;
-    }
 }
 void
 drain_rod_charge (object *rod)
 {
   rod->stats.hp -= SP_level_spellpoint_cost (rod, rod->inv, SPELL_HIGHEST);
       if (op->type != PLAYER)
         return 0;
       if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
         new_draw_info_format (NDI_UNIQUE, 0, op, "This ground is unholy! %s ignores you.", godname);
+      else if (object *item = op->contr->ranged_ob)
+        {
+          if (item->type == SPELL)
+            new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your spellcasting.");
+          else if (item->type == SCROLL)
+            new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll.");
+          else
+            new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");
+        }
       else
         new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the spell!");
       return 0;
     }

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