[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.47 by root, Thu May 17 20:27:02 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);
    * at least process that code.
    */
   if (op->type == PLAYER && op == caster)
     {
       cast_level = caster_level (caster, spell_ob);
       if (spell_ob->skill)
         {
           skill = find_skill_by_name (op, spell_ob->skill);
           if (!skill)
             {
               new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s.", &spell_ob->skill, &spell_ob->name);
               return 0;
             }
           if (min_casting_level (op, spell_ob) > cast_level && !QUERY_FLAG (op, FLAG_WIZ))
             {
               new_draw_info (NDI_UNIQUE, 0, op, "You lack enough skill to cast that spell.");
               return 0;
             }
         }
       /* If the caster is the wiz, they don't ever fail, and don't have
        * to have sufficient grace/mana.
        */
       if (!QUERY_FLAG (op, FLAG_WIZ))
         {
               (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
             {
               play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
               new_draw_info (NDI_UNIQUE, 0, op, "You fumble the spell.");
-              if (settings.casting_time == TRUE)
-                op->casting_time = -1;
               op->stats.grace -= random_roll (1, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE), op, PREFER_LOW);
               return 0;
             }
           else if (spell_ob->stats.sp)
             {
       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;
     }
-  if (caster == op && settings.casting_time == TRUE && spell_ob->type == SPELL)
-    {
-      if (op->casting_time == -1)
-        {                       /* begin the casting */
-          op->casting_time = (sint16) (spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob));
-          op->spell = spell_ob;
-          /* put the stringarg into the object struct so that when the
-           * spell is actually cast, it knows about the stringarg.
-           * necessary for the invoke command spells.
-           */
-          if (stringarg)
-            {
-              op->spellarg = strdup (stringarg);
-            }
-          else
-            op->spellarg = NULL;
-          return 0;
-        }
-      else if (op->casting_time != 0)
-        {
-          if (op->type == PLAYER)
-            new_draw_info (NDI_UNIQUE, 0, op, "You are casting!");
-          return 0;
-        }
-      else
-        {                       /* casting_time == 0 */
-          op->casting_time = -1;
-          spell_ob = op->spell;
-          stringarg = op->spellarg;
-        }
-    }
-  else
-    {
-      /* Take into account how long it takes to cast the spell.
+  /* Take into account how long it takes to cast the spell.
-       * if the player is casting it, then we use the time in
+   * if the player is casting it, then we use the time in
-       * the spell object.  If it is a spell object, have it
+   * the spell object.  If it is a spell object, have it
-       * take two ticks.  Things that cast spells on the players
+   * take two ticks.  Things that cast spells on the players
-       * behalf (eg, altars, and whatever else) shouldn't cost
+   * behalf (eg, altars, and whatever else) shouldn't cost
-       * the player any time.
+   * the player any time.
-       * Ignore casting time for firewalls
+   * Ignore casting time for firewalls
+   */
+  if (caster == op && caster->type != FIREWALL)
+    {
+      op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
+      /* Other portions of the code may also decrement the speed of the player, so
+       * put a lower limit so that the player isn't stuck here too long
        */
-      if (caster == op && caster->type != FIREWALL)
-        {
-          op->speed_left -= spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
-          /* Other portions of the code may also decrement the speed of the player, so
-           * put a lower limit so that the player isn't stuck here too long
-           */
-          if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))
+      if ((spell_ob->casting_time > 0) && op->speed_left < -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed))
-            op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
+        op->speed_left = -spell_ob->casting_time * PATH_TIME_MULT (op, spell_ob) * FABS (op->speed);
-        }
+    }
-      else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
+  else if (caster->type == WAND || caster->type == HORN || caster->type == ROD || caster->type == POTION || caster->type == SCROLL)
-        {
-          op->speed_left -= 2 * FABS (op->speed);
+    op->speed_left -= 2 * FABS (op->speed);
-        }
-    }
   if (op->type == PLAYER && op == caster)
     {
       op->stats.grace -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE);
       op->stats.sp -= SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA);
       if (!skill)
         {
           new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster));
           return 0;
         }
-      change_skill (op, skill, 0);      /* needed for proper exp credit */
+      op->change_skill (skill);      /* needed for proper exp credit */
     }
   switch (spell_ob->subtype)
     {
-        /* The order of case statements is same as the order they show up
+      /* The order of case statements is same as the order they show up
-         * in in spells.h.
+       * in in spells.h.
-         */
+       */
       case SP_RAISE_DEAD:
         success = cast_raise_dead_spell (op, caster, spell_ob, dir, stringarg);
         break;
       case SP_RUNE:
   /* FIXME - we need some better sound suppport */
   // yes, for example, augment map info with the spell effect
   // so clients can calculate the sounds themselves
   //play_sound_map(op->map, op->x, op->y, SOUND_CAST_SPELL_0 + spell_ob->subtype);
-  /* free the spell arg */
-  if (settings.casting_time == TRUE && stringarg)
-    {
-      free (stringarg);
-      stringarg = 0;
-    }
   return success;
 }
 /* This is called from time.c/process_object().  That function

Diff Legend

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

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.47 by root, Thu May 17 20:27:02 2007 UTC

Diff Legend

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.47 by root, Thu May 17 20:27:02 2007 UTC