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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.59 by root, Mon Aug 27 05:10:51 2007 UTC vs.
Revision 1.60 by root, Sun Sep 2 05:18:52 2007 UTC

  * dir: direction to fire in.
  * spell: spell that is being fired.  It uses other_arch for the archetype
  * to fire.
  * returns 0 on failure, 1 on success.
  */
 int
 fire_arch_from_position (object *op, object *caster, sint16 x, sint16 y, int dir, object *spell)
 {
   object *tmp;
   int mflags;
  */
 int
 cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
 {
   const char *godname;
-  int success = 0, mflags, cast_level = 0;
+  int success = 0, cast_level = 0;
   object *skill = NULL;
   if (!spell_ob)
     {
       LOG (llevError, "cast_spell: null spell object passed\n");
         {
           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);
+              op->failmsg (format ("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.");
+              op->failmsg ("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
       if (!QUERY_FLAG (op, FLAG_WIZ))
         {
           if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
               SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
             {
-              new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough mana.");
+              op->failmsg ("You don't have enough mana!");
               return 0;
             }
           if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) &&
               SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) > op->stats.grace)
             {
               if (random_roll (0, op->stats.Wis - 1, op, PREFER_HIGH) + op->stats.grace -
                   10 * SP_level_spellpoint_cost (caster, spell_ob, SPELL_GRACE) / op->stats.maxgrace > 0)
-                {
-                  new_draw_info_format (NDI_UNIQUE, 0, op, "%s grants your prayer, though you are unworthy.", godname);
+                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);
-                  new_draw_info_format (NDI_UNIQUE, 0, op, "%s ignores your prayer.", godname);
+                  op->failmsg (format ("%s ignores your prayer.", godname));
                   return 0;
                 }
             }
           /* player/monster is trying to cast the spell.  might fumble it */
           if (spell_ob->stats.grace && random_roll (0, 99, op, PREFER_HIGH) <
               (spell_ob->level / (float) MAX (1, op->level) * cleric_chance[op->stats.Wis]))
             {
               op->contr->play_sound (sound_find ("fumble_spell"));
-              new_draw_info (NDI_UNIQUE, 0, op, "You fumble the prayer.");
+              op->failmsg ("You fumble the prayer.");
               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)
             {
               int failure = random_roll (0, 199, op, PREFER_HIGH) - op->contr->encumbrance + op->level - spell_ob->level + 35;
               if (failure < 0)
                 {
-                  new_draw_info (NDI_UNIQUE, 0, op, "You bungle the spell because you have too much heavy equipment in use.");
+                  op->failmsg ("You bungle the spell because you have too much heavy equipment in use.");
                   if (settings.spell_failure_effects == TRUE)
                     spell_failure (op, failure, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), skill);
                   op->stats.sp -= random_roll (0, SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA), op, PREFER_LOW);
                   return 0;
                 }
             }
         }
     }
-  mflags = get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL);
+  int mflags = op->ms ().flags ();
   /* See if we can cast a spell here.  If the caster and op are
    * not alive, then this would mean that the mapmaker put the
    * objects on the space - presume that they know what they are
    * doing.
       if ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)
         op->failmsg (format ("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.");
+            op->failmsg ("Something blocks your spellcasting.");
           else if (item->type == SCROLL)
-            new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your scroll.");
+            op->failmsg ("Something blocks the magic of your scroll.");
           else
-            new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of your item.");
+            op->failmsg ("Something blocks the magic of your item.");
         }
       else
-        new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the spell!");
+        op->failmsg ("Something blocks the spell!");
       return 0;
     }
   /* Take into account how long it takes to cast the spell.
   if (op != caster && !skill && caster->skill)
     {
       skill = find_skill_by_name (op, caster->skill);
       if (!skill)
         {
-          new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use the %s", &caster->skill, query_name (caster));
+          op->failmsg (format ("You lack the skill %s to use the %s!", &caster->skill, query_name (caster)));
           return 0;
         }
       op->change_skill (skill);      /* needed for proper exp credit */
     }
 #ifdef NO_POLYMORPH
         /* Not great, but at least provide feedback so if players do have
          * polymorph (ie, find it as a preset item or left over from before
          * it was disabled), they get some feedback.
          */
-        new_draw_info (NDI_UNIQUE, 0, op, "The spell fizzles");
+        op->failmsg ("The spell fizzles!");
         success = 0;
 #else
         success = cast_polymorph (op, caster, spell_ob, dir);
 #endif
         break;
         break;
       case SP_MOVING_BALL:
         if (spell_ob->path_repelled && (spell_ob->path_repelled & caster->path_attuned) != spell_ob->path_repelled)
           {
-            new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the proper attunement to cast %s", &spell_ob->name);
+            op->failmsg (format ("You lack the proper attunement to cast %s!", &spell_ob->name));
             success = 0;
           }
         else
           success = fire_arch_from_position (op, caster, op->x + freearr_x[dir], op->y + freearr_y[dir], dir, spell_ob);
         break;
   op->play_sound (success ? spell_ob->sound : sound_find ("fumble_spell"));
   return success;
 }
-/* This is called from time.c/process_object().  That function
+/* This is called from time.c/process_object(). That function
- * calls this for any SPELL_EFFECT type objects.  This function
+ * calls this for any SPELL_EFFECT type objects. This function
  * then dispatches them to the appropriate specific routines.
  */
 void
 move_spell_effect (object *op)
 {
         else if (victim->materialname)
           save_throw_object (victim, spell->attacktype, spell);
         break;
     }
 }

Diff Legend

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

Comparing deliantra/server/server/spell_util.C (file contents): Revision 1.59 by root, Mon Aug 27 05:10:51 2007 UTC vs. Revision 1.60 by root, Sun Sep 2 05:18:52 2007 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.59 by root, Mon Aug 27 05:10:51 2007 UTC vs.
Revision 1.60 by root, Sun Sep 2 05:18:52 2007 UTC