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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.115 by root, Sat Apr 10 05:12:57 2010 UTC vs.
Revision 1.122 by root, Sat Dec 31 06:18:02 2011 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
  * 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
       sp *= (int) PATH_SP_MULT (caster, spell);
       if (!sp && spell->stats.sp)
         sp = 1;
       if (spell->stats.grace && spell->stats.maxgrace)
-        grace = spell->stats.grace * (1.0 + max (0, float (level - spell->level) / spell->stats.maxgrace));
+        grace = spell->stats.grace * (1.f + max (0.f, float (level - spell->level) / spell->stats.maxgrace));
       else
         grace = spell->stats.grace;
       grace *= PATH_SP_MULT (caster, spell);
       if (spell->stats.grace && !grace)
 {
   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);
   if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
     return 0;
   int max_effects = 5; // max. number of similar spells per mapspace
-  for (object *tmp = ms.bot; tmp; tmp = tmp->above)
+  for (object *tmp = ms.top; tmp; tmp = tmp->below)
     {
       /* If there is a counterspell on the space, and this
        * object is using magic, don't progress.  I believe we could
        * leave this out and let in progress, and other areas of the code
        * will then remove it, but that would seem to to use more
        * 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];
  * at casting a prayer.
  * op is the player.
  * failure is basically how much grace they had.
  * power is how much grace the spell would normally take to cast.
  */
+#define HINT_GRACE " H<Make sure you always have enough grace points for your prayers.>"
 static void
 prayer_failure (object *op, int failure, int power)
 {
   const char *godname;
   object *tmp;
   if (!strcmp ((godname = determine_god (op)), "none"))
     godname = "Your spirit";
   if (failure <= -20 && failure > -40)  /* wonder */
     {
-      new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname);
+      op->failmsgf ("%s gives a sign to renew your faith." HINT_GRACE, godname);
-      tmp = get_archetype (SPELL_WONDER);
+      tmp = archetype::get (SPELL_WONDER);
       cast_cone (op, op, 0, tmp);
       tmp->destroy ();
     }
   else if (failure <= -40 && failure > -60)     /* confusion */
     {
-      new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!");
+      op->failmsg ("Your diety touches your mind!" HINT_GRACE);
       confuse_player (op, op, 99);
     }
   else if (failure <= -60 && failure > -150)    /* paralysis */
     {
-      new_draw_info_format (NDI_UNIQUE, 0, op, "%s requires you to pray NOW.", godname);
+      op->failmsgf ("%s requires you to pray NOW. "
-      new_draw_info (NDI_UNIQUE, 0, op, "You comply, ignoring all else.");
+                    "You comply, ignoring all else." HINT_GRACE,
+                    godname);
       paralyze_player (op, op, 99);
     }
   else if (failure <= -150)     /* blast the immediate area */
     {
-      tmp = get_archetype (GOD_POWER);
+      tmp = archetype::get (GOD_POWER);
-      new_draw_info_format (NDI_UNIQUE, 0, op, "%s smites you!", godname);
+      op->failmsgf ("%s smites you!" HINT_GRACE, godname);
       cast_magic_storm (op, tmp, power);
     }
 }
 /*
   if (settings.spell_failure_effects == FALSE)
     return;
   if (failure <= -20 && failure > -40)  /* wonder */
     {
-      new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect.");
+      op->failmsg ("Your spell causes an unexpected effect.");
-      tmp = get_archetype (SPELL_WONDER);
+      tmp = archetype::get (SPELL_WONDER);
       cast_cone (op, op, 0, tmp);
       tmp->destroy ();
     }
   else if (failure <= -40 && failure > -60)     /* confusion */
     {
-      new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!");
+      op->failmsg ("Your magic recoils on you, making you confused!");
       confuse_player (op, op, 99);
     }
   else if (failure <= -60 && failure > -80)     /* paralysis */
     {
-      new_draw_info (NDI_UNIQUE, 0, op, "Your magic stuns you!");
+      op->failmsg ("Your magic stuns you!");
       paralyze_player (op, op, 99);
     }
   else if (failure <= -80)      /* blast the immediate area */
     {
       object *tmp;
       /* Safety check to make sure we don't get any mana storms in scorn */
       if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)
         {
-          new_draw_info (NDI_UNIQUE, 0, op, "The magic warps and you are turned inside out!");
+          op->failmsg ("The magic warps and you are turned inside out!");
           hit_player (op, 9998, op, AT_INTERNAL, 1);
         }
       else
         {
-          new_draw_info (NDI_UNIQUE, 0, op, "You lose control of the mana!  The uncontrolled magic blasts you!");
+          op->failmsg ("You lose control of the mana!  The uncontrolled magic blasts you!");
-          tmp = get_archetype (LOOSE_MANA);
+          tmp = archetype::get (LOOSE_MANA);
           tmp->level = skill->level;
           /* increase the area of destruction a little for more powerful spells */
           tmp->range += isqrt (power);
 cast_spell (object *op, object *caster, int dir, object *spell_ob, char *spellparam)
 {
   const char *godname;
   int success = 0;
+  // make sure spells always take a while, so a) we don't flood the
+  // user with messages and b) too many failures can be harmful (smiting).
+  op->speed_left -= 4 * op->speed; // ~0.5s on failure
   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.");
+      op->failmsg ("That spell path is denied to you.");
       return 0;
     }
   object *skill = 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_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;
         op->failmsg ("Something blocks the spell!");
       return 0;
     }
+  // undo the flood protection from earlier
+  op->speed_left += 4 * op->speed; // ~0.5s on failure
   /* Take into account how long it takes to cast the spell.
    * if the player is casting it, then we use the time in
    * the spell object.  If it is a spell object, have it
    * take two ticks.  Things that cast spells on the players
    * behalf (eg, altars, and whatever else) shouldn't cost
 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;
  * the victim with a specific maximum level.
  */
 void
 create_exploding_ball_at (object *victim, int level)
 {
-  object *ball = get_archetype (EXPLODING_FIREBALL);
+  object *ball = archetype::get (EXPLODING_FIREBALL);
   ball->dam_modifier = random_roll (1, level, victim, PREFER_LOW) / 5 + 1;
   ball->stats.maxhp  = random_roll (1, level, victim, PREFER_LOW) / 10 + 2;
   ball->insert_at (victim);
 }

Diff Legend

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

Comparing deliantra/server/server/spell_util.C (file contents): Revision 1.115 by root, Sat Apr 10 05:12:57 2010 UTC vs. Revision 1.122 by root, Sat Dec 31 06:18:02 2011 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.115 by root, Sat Apr 10 05:12:57 2010 UTC vs.
Revision 1.122 by root, Sat Dec 31 06:18:02 2011 UTC