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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.122 by root, Sat Dec 31 06:18:02 2011 UTC vs.
Revision 1.126 by root, Wed Nov 21 12:12:03 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 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
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
 #include <spells.h>
       return spop;
   return 0;
 }
 /*
  * Look at object 'op' and see if they know the spell
  * spname. This is pretty close to check_spell_known
  * above, but it uses a looser matching mechanism.
  * returns the matching spell object, or NULL.
  * If we match multiple spells but don't get an
  * exact match, we also return NULL.
  */
 object *
-lookup_spell_by_name (object *op, const char *spname)
+object::find_spell (shstr_cmp name) const
 {
-  object *spob1 = 0, *spob2 = 0;
-  int nummatch = 0;
-  if (!spname)
-    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 (object *spob = op->inv; spob; spob = spob->below)
+  for (object *spob = inv; spob; spob = spob->below)
-    {
+    if (spob->name == name && spob->type == SPELL)
-      if (spob->type == SPELL)
-        {
-          // TODO: WTF?
-          if (!strncmp (spob->name, spname, strlen (spname)))
-            {
-              nummatch++;
-              spob1 = spob;
-            }
-          else if (!strncmp (spob->name, spname, strlen (spob->name)))
-            {
-              /* if spells have ambiguous names, it makes matching
-               * really difficult.  (eg, fire and fireball would
-               * 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;
+      return spob;
-  if (spob1 && nummatch == 1)
-    return spob1;
-  return NULL;
+  return 0;
 }
 /* reflwall - decides weither the (spell-)object sp_op will
  * be reflected from the given mapsquare. Returns 1 if true.
  * (Note that for living creatures there is a small chance that
 /* cast_create_object: creates object new_op in direction dir
  * or if that is blocked, beneath the player (op).
  * we pass 'caster', but don't use it for anything.
  * This is really just a simple wrapper function .
- * returns the direction that the object was actually placed
+ * returns true to indicate whether the operation was successful.
- * in.
+ * destroys the object is unsuccessful.
  */
-int
+bool
 cast_create_obj (object *op, object *caster, object *new_op, int dir)
 {
-  maptile *m;
+  mapxy pos (op);
-  sint16 sx, sy;
+  pos.move (dir);
-  if (dir &&
+  if (!pos.normalise ()
-      ((get_map_flags (op->map, &m, op->x + freearr_x[dir], op->y + freearr_y[dir], &sx, &sy) & P_OUT_OF_MAP) ||
+      || pos->blocks (op) // perversely enough, we check if the palyer can reach that space
-       OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))))
+      || !new_op->can_drop_at (pos.m, pos.x, pos.y)
+      )
     {
-      new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
+      op->failmsg ("Your spell fizzles! H<Something is in the way.>");
-      new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
+      new_op->destroy ();
-      dir = 0;
+      return 0;
     }
   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);
+  pos.insert (new_op, op, dir ? 0 : INS_BELOW_ORIGINATOR);
-  return dir;
+  return 1;
 }
 static bool
 mergable_owner (object *o1, object *o2)
 {
       op->failmsgf ("%s smites you!" HINT_GRACE, godname);
       cast_magic_storm (op, tmp, power);
     }
 }
 /*
  * spell_failure()  handles the various effects for differing degrees
  * of failure badness.
  * op is the player that failed.
  * failure is a random value of how badly you failed.
  * power is how many spellpoints you'd normally need for the spell.
  * skill is the skill you'd need to cast the spell.
  */
 void
 spell_failure (object *op, int failure, int power, object *skill)
 {
   object *tmp;

Diff Legend

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

Comparing deliantra/server/server/spell_util.C (file contents): Revision 1.122 by root, Sat Dec 31 06:18:02 2011 UTC vs. Revision 1.126 by root, Wed Nov 21 12:12:03 2012 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.122 by root, Sat Dec 31 06:18:02 2011 UTC vs.
Revision 1.126 by root, Wed Nov 21 12:12:03 2012 UTC