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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.109 by root, Sun Nov 29 17:41:08 2009 UTC vs.
Revision 1.115 by root, Sat Apr 10 05:12:57 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 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.
 int
 cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
 {
   const char *godname;
   int success = 0;
-  object *skill = NULL;
   if (!spell_ob)
     {
       LOG (llevError, "cast_spell: null spell object passed\n");
       return 0;
     {
       new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you.");
       return 0;
     }
+  object *skill = 0;
   /* if it is a player casting the spell, and they are really casting it
    * (vs it coming from a wand, scroll, or whatever else), do some
    * checks.  We let monsters do special things - eg, they
-   * don't need the skill, bypass level checks, etc. The monster function
+   * don't need the SKILL, BYpass level checks, etc. The monster function
    * should take care of that.
    * Remove the wiz check here and move it further down - some spells
    * need to have the right skill pointer passed, so we need to
    * at least process that code.
    */
         {
           skill = find_skill_by_name (op, spell_ob->skill);
           if (!skill)
             {
-              op->failmsg (format ("You need the skill %s to cast %s! "
+              op->failmsgf ("You need the %s skill to cast %s! "
-                                   "H<You either need to learn the skill via a skill scroll "
+                            "H<You either need to learn the skill via a skill scroll "
-                                   "or you need to wear a talisman or holy symbol.>",
+                            "or you need to wear a talisman, holy symbol or another skill tool.>",
-                                   &spell_ob->skill, &spell_ob->name));
+                            &spell_ob->skill, &spell_ob->name);
-               return 0;
+              return 0;
             }
           const char *msg = "";
           int caster_level = skill->level;
               msg = " (repelled)";
             }
           if (spell_ob->level > caster_level)
             {
-              op->failmsg (format ("You lack enough skill to cast that spell! "
+              op->failmsgf ("You lack enough skill to cast that spell! "
-                                   "H<Your effective cast level is %d%s, but level %d is required.>",
+                            "H<Your effective cast level is %d%s, but level %d is required.>",
-                                   caster_level, msg, spell_ob->level));
+                            caster_level, msg, spell_ob->level);
               if (!op->is_wiz ())
                 return 0;
             }
         }
                   10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
                 op->statusmsg (format ("%s grants your prayer, though you are unworthy.", godname));
               else
                 {
                   prayer_failure (op, op->stats.grace, SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) - op->stats.grace);
-                  op->failmsg (format ("%s ignores your prayer.", godname));
+                  op->failmsgf ("%s ignores your prayer.", godname);
                   return 0;
                 }
             }
           /* player/monster is trying to cast the spell.  might fumble it */
    * doing.
    */
   if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST))      // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
     {
+      op->speed_left -= 2 * op->speed; // freeze for two ticks, so we don't flood
       op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
       return 0;
     }
   if ((spell_ob->type == SPELL)
     {
       if (op->type != PLAYER)
         return 0;
       if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
-        op->failmsg (format ("This ground is unholy! %s ignores you.", godname));
+        op->failmsgf ("This ground is unholy! %s ignores you.", godname);
       else if (object *item = op->contr->ranged_ob)
         {
           if (item->type == SPELL)
             op->failmsg ("Something blocks your spellcasting.");
           else if (item->type == SCROLL)
    * object requires.
    */
   if (op != caster && !skill && caster->skill)
     {
       skill = find_skill_by_name (op, caster->skill);
       if (!skill)
         {
-          op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
+          op->failmsgf ("You lack the %s skill, which is required to use the %s!", &caster->skill, query_name (caster));
           return 0;
         }
-      op->change_skill (skill);      /* needed for proper exp credit */
     }
   if (INVOKE_OBJECT (CAST_SPELL, spell_ob, ARG_OBJECT (op), ARG_OBJECT (caster), ARG_INT (dir), ARG_STRING (spellparam)))
     return RESULT_INT (0);
+  // temporaroly replace chosen_skill by skill, we assume skill *could* be applied,
+  // at least temporarily, which might not be true due to slot restrictions, but hey
+  // invoke requires it basically.
+  object *chosen_skill = op->chosen_skill;
+  op->chosen_skill = skill;
   switch (spell_ob->subtype)
     {
       /* The order of case statements is same as the order they show up
        * in spells.h.
         break;
       case SP_MOVING_BALL:
         if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
           {
-            op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
+            op->failmsgf ("You lack the proper attunement to cast %s!", &spell_ob->name);
             success = 0;
           }
         else
           success = fire_arch_from_position (op, caster, op->x, op->y, dir, spell_ob);
         break;
         break;
       default:
         LOG (llevError, "cast_spell: Unhandled spell subtype %d\n", spell_ob->subtype);
     }
+  // restore chosen_skill
+  op->chosen_skill = chosen_skill;
   op->play_sound (
      success
         ? spell_ob->sound
              ? spell_ob->sound

Diff Legend

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

Comparing deliantra/server/server/spell_util.C (file contents): Revision 1.109 by root, Sun Nov 29 17:41:08 2009 UTC vs. Revision 1.115 by root, Sat Apr 10 05:12:57 2010 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.109 by root, Sun Nov 29 17:41:08 2009 UTC vs.
Revision 1.115 by root, Sat Apr 10 05:12:57 2010 UTC