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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.80 by root, Mon Sep 29 08:25:02 2008 UTC vs.
Revision 1.91 by root, Sun Jan 11 00:31:52 2009 UTC

 /* This returns a random spell from 'ob'.  If skill is set, then
  * the spell must be of this skill, it can be NULL in which case all
  * matching spells are used.
  */
 object *
-find_random_spell_in_ob (object *ob, const char *skill)
+find_random_spell_in_ob (object *ob, shstr_cmp skill)
 {
   int k = 0, s;
   for (object *tmp = ob->inv; tmp; tmp = tmp->below)
     if (tmp->type == SPELL && (!skill || tmp->skill == skill))
   /* No spells, no need to progess further */
   if (!k)
     return NULL;
-  s = RANDOM () % k;
+  s = rndm (k);
   for (object *tmp = ob->inv; tmp; tmp = tmp->below)
     if (tmp->type == SPELL && (!skill || tmp->skill == skill))
       if (!s)
         return tmp;
   // repell has no such quarrels
   return (caster->path_attuned  & spell->path_attuned ? min (level, +ATTUNE_REPELL) : 0)
        + (caster->path_repelled & spell->path_attuned ?             -ATTUNE_REPELL  : 0);
 }
-/*
- * This function takes a caster and spell and presents the
- * effective level the caster needs to be to cast the spell.
- * basically, it just adjusts the spell->level with attuned/repelled
- * spellpaths. Was called path_level_mod.
- *
- * caster is person casting the spell.
- * spell is the spell object.
- * Returns modified level.
- */
-int
-min_casting_level (object *caster, object *spell)
-{
-  if (caster->path_denied & spell->path_attuned)
-    return 500;
-  return max (1, spell->level + attuned_bonus (caster, spell, spell->level));
-}
 /* This function returns the effective level the spell
  * is being cast at.
  */
 int
 casting_level (object *caster, object *spell)
     level = lerp (level, (int)spell->level, 100, 1, 100);
   /* Always make this at least 1.  If this is zero, we get divide by zero
    * errors in various places.
    */
-  return max (level, 1);
+  return clamp (level, 1, settings.max_level);
 }
 /* The following function scales the spellpoint cost of
  * a spell by it's increased effectiveness.  Some of the
  * lower level spells become incredibly vicious at high
 /* Checks to see if player knows the spell.  If the name is the same
  * as an existing spell, we presume they know it.
  * returns 1 if they know the spell, 0 if they don't.
  */
 object *
-check_spell_known (object *op, const char *name)
+check_spell_known (object *op, shstr_cmp name)
 {
   object *spop;
-  shstr_cmp name_ (name);
   for (spop = op->inv; spop; spop = spop->below)
     if (spop->type == SPELL && spop->name == name)
       return spop;
  * exact match, we also return NULL.
  */
 object *
 lookup_spell_by_name (object *op, const char *spname)
 {
-  object *spob1 = NULL, *spob2 = NULL, *spob;
+  object *spob1 = 0, *spob2 = 0;
   int nummatch = 0;
-  if (spname == NULL)
+  if (!spname)
-    return NULL;
+    return 0;
   /* Try to find the spell.  We store the results in spob1
    * and spob2 - spob1 is only taking the length of
    * the past spname, spob2 uses the length of the spell name.
    */
-  for (spob = op->inv; spob; spob = spob->below)
+  for (object *spob = op->inv; spob; spob = spob->below)
     {
       if (spob->type == SPELL)
         {
+          // TODO: WTF?
           if (!strncmp (spob->name, spname, strlen (spname)))
             {
               nummatch++;
               spob1 = spob;
             }
                * fall into this category).  It shouldn't be hard to
                * make sure spell names don't overlap in that fashion.
                */
               if (spob2)
                 LOG (llevError, "Found multiple spells with overlapping base names: %s, %s\n", &spob2->name, &spob->name);
               spob2 = spob;
             }
         }
     }
   /* if we have best match, return it.  Otherwise, if we have one match
    * on the loser match, return that, otehrwise null
    */
   if (spob2)
     return spob2;
   if (spob1 && nummatch == 1)
     return spob1;
   return NULL;
 }
 /* reflwall - decides weither the (spell-)object sp_op will
  * be reflected from the given mapsquare. Returns 1 if true.
     {
       SET_ANIMATION (op, ATTACKS[i].face);
     }
 }
 /* prayer_failure: This is called when a player fails
  * 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.
  */
 void
 prayer_failure (object *op, int failure, int power)
 {
   const char *godname;
   object *tmp;
  */
 int
 cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
 {
   const char *godname;
-  int success = 0, cast_level = 0;
+  int success = 0;
   object *skill = NULL;
   if (!spell_ob)
     {
       LOG (llevError, "cast_spell: null spell object passed\n");
           int caster_level = skill->level;
           if (op->path_attuned & spell_ob->path_attuned)
             {
-              caster_level += min (cast_level * 2, ATTUNE_REPELL);
+              caster_level += min (caster_level, ATTUNE_REPELL);
               msg = " (attuned)";
             }
           if (op->path_repelled & spell_ob->path_attuned)
             {
-              caster_level = ATTUNE_REPELL; // negative is ok
+              caster_level -= ATTUNE_REPELL; // negative is ok
               msg = " (repelled)";
             }
           if (spell_ob->level > caster_level)
             {
         }
       /* 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))
+      if (!QUERY_FLAG (op, 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!");
       case SP_MAGIC_MISSILE:
         if (QUERY_FLAG (victim, FLAG_ALIVE))
           {
             hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
-            if (!spell->destroyed ())
-              spell->destroy ();
+            spell->destroy ();
           }
         break;
       case SP_MOVING_BALL:
         if (QUERY_FLAG (victim, FLAG_ALIVE))
           hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
         else if (victim->materialname)
           save_throw_object (victim, spell->attacktype, spell);
-        break;
-    }
-}
+        break;
+    }
+}

Diff Legend

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

Comparing deliantra/server/server/spell_util.C (file contents): Revision 1.80 by root, Mon Sep 29 08:25:02 2008 UTC vs. Revision 1.91 by root, Sun Jan 11 00:31:52 2009 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.80 by root, Mon Sep 29 08:25:02 2008 UTC vs.
Revision 1.91 by root, Sun Jan 11 00:31:52 2009 UTC