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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.114 by root, Sat Apr 10 04:54:10 2010 UTC vs.
Revision 1.116 by root, Sun Apr 11 00:34:06 2010 UTC

 {
   if (OUT_OF_REAL_MAP (m, x, y))
     return 0;
   for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
-    if (QUERY_FLAG (op, FLAG_REFL_SPELL)
+    if (op->flag [FLAG_REFL_SPELL]
-        && (!QUERY_FLAG (op, FLAG_ALIVE)
+        && (!op->flag [FLAG_ALIVE]
             || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
       return 1;
   return 0;
 }
       new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
       new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
       dir = 0;
     }
-  SET_FLAG (new_op, FLAG_IDENTIFIED);
+  new_op->set_flag (FLAG_IDENTIFIED);
   op->map->insert (new_op,
                    op->x + freearr_x[dir], op->y + freearr_y[dir],
                    op,
                    dir ? 0 : INS_BELOW_ORIGINATOR);
        * on top of a counterwall spell (may hit the player before being
        * removed.)  On the other hand, it may be more dramatic for the
        * spell to actually hit the counterwall and be sucked up.
        */
       if ((tmp->attacktype & AT_COUNTERSPELL)
-          && !QUERY_FLAG (tmp, FLAG_MONSTER)
+          && !tmp->flag [FLAG_MONSTER]
           && (tmp->type != PLAYER)
           && (tmp->type != WEAPON)
           && (tmp->type != BOW)
           && (tmp->type != ARROW)
           && (tmp->type != GOLEM)
-          && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX:
+          && !tmp->flag [FLAG_IS_FLOOR] // XXX:
                                               // we special case floor here because there
                                               // are sometimes spell effect floors
                                               // which are used to inflict damage
                                               // (and those shouldn't go away from
                                               //  sanctuary) see also: permanent lava
   /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
   if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
     if (!tailor_god_spell (tmp, op))
       return 0;
-  if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
+  if (tmp->flag [FLAG_IS_TURNABLE])
     SET_ANIMATION (tmp, dir);
   if ((tmp = op->map->insert (tmp, x, y, op)))
     move_spell_effect (tmp);
     {
       tmp = op->owner;
       /* If the owner does not exist, or is not a monster, than apply the spell
        * to the caster.
        */
-      if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER))
+      if (!tmp || !tmp->flag [FLAG_MONSTER])
         tmp = op;
     }
   else
     {
       maptile *m = op->map;
         continue;
       tmp = GET_MAP_OB (mp, nx, ny);
       while (tmp != NULL && (((owner_type == PLAYER &&
-                               !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) ||
+                               !tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_GENERATOR]) ||
                               (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude))))
         tmp = tmp->above;
       if (tmp != NULL && can_see_monsterP (m, x, y, i))
         return freedir[i];
 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;
     }
   /* if caster is a spell casting object, this normally shouldn't be
    * an issue, because they don't have any spellpaths set up.
    */
-  if (caster->path_denied & spell_ob->path_attuned && !QUERY_FLAG (caster, FLAG_WIZCAST))
+  if (caster->path_denied & spell_ob->path_attuned && !caster->flag [FLAG_WIZCAST])
     {
       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.
    */
         }
       /* 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_WIZCAST))
+      if (!op->flag [FLAG_WIZCAST])
         {
           if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
               SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
             {
               op->failmsg ("You don't have enough mana!");
    * 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_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST))      // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
+  if ((mflags & P_SAFE) && !op->flag [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)
       && (caster->type != POTION)
-      && !QUERY_FLAG (op, FLAG_WIZCAST)
+      && !op->flag [FLAG_WIZCAST]
-      && (QUERY_FLAG (caster, FLAG_ALIVE)
+      && (caster->flag [FLAG_ALIVE]
-          || QUERY_FLAG (op, FLAG_ALIVE))
+          || op->flag [FLAG_ALIVE])
       && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)))
     {
       if (op->type != PLAYER)
         return 0;
    * object requires.
    */
   if (op != caster && !skill && caster->skill)
     {
       skill = find_skill_by_name (op, caster->skill);
       if (!skill)
         {
           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.
       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
              : sound_find ("spell_success")
 apply_spell_effect (object *spell, object *victim)
 {
   switch (spell->subtype)
     {
       case SP_CONE:
-        if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->has_active_speed () && spell->attacktype)
+        if (victim->flag [FLAG_ALIVE] && spell->has_active_speed () && spell->attacktype)
           hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0);
         break;
       case SP_MAGIC_MISSILE:
-        if (QUERY_FLAG (victim, FLAG_ALIVE))
+        if (victim->flag [FLAG_ALIVE])
           {
             hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
             spell->destroy ();
           }
         break;
       case SP_MOVING_BALL:
-        if (QUERY_FLAG (victim, FLAG_ALIVE))
+        if (victim->flag [FLAG_ALIVE])
           hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
         else if (victim->material != MATERIAL_NULL)
           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.114 by root, Sat Apr 10 04:54:10 2010 UTC vs. Revision 1.116 by root, Sun Apr 11 00:34:06 2010 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.114 by root, Sat Apr 10 04:54:10 2010 UTC vs.
Revision 1.116 by root, Sun Apr 11 00:34:06 2010 UTC