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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.128 by root, Wed Nov 16 23:42:03 2016 UTC vs.
Revision 1.131 by root, Sat Nov 17 23:40:04 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
  * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 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
 }
 /* Returns true if it is ok to put spell *op on the space/may provided.
  * immune_stop is basically the attacktype of the spell (why
  * passed as a different value, not sure of).  If immune_stop
  * has the AT_MAGIC bit set, and there is a counterwall
  * on the space, the object doesn't get placed.  if immune stop
  * does not have AT_MAGIC, then counterwalls do not effect the spell.
  */
 int
 ok_to_put_more (maptile *m, sint16 x, sint16 y, object *op, int immune_stop)
         tmp = op;
     }
   else
     {
       maptile *m = op->map;
-      sint16 x = op->x + freearr_x[dir];
+      sint16 x = op->x + DIRX (dir);
-      sint16 y = op->y + freearr_y[dir];
+      sint16 y = op->y + DIRY (dir);
       tmp = xy_normalise (m, x, y)
             ? m->at (x, y).player ()
             : 0;
     }
   if (exclude && exclude->type)
     owner_type = exclude->type;
   for (i = rndm (1, 8); i < max; i++)
     {
-      nx = x + freearr_x[i];
+      nx = x + DIRX (i);
-      ny = y + freearr_y[i];
+      ny = y + DIRY (i);
       mp = m;
       mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
       if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW))
         continue;
   if ((at = archetype::find (monstername)) == NULL)
     return;
   /* find a free square nearby
    * first we check the closest square for free squares
    */
   dir = find_first_free_spot (at, op->map, op->x, op->y);
   if (dir != -1)
     {
        */
       //TODO: use expand_tail + ...
       while (at != NULL)
         {
           tmp = at->instance ();
-          tmp->x = op->x + freearr_x[dir] + at->x;
+          tmp->x = op->x + DIRX (dir) + at->x;
-          tmp->y = op->y + freearr_y[dir] + at->y;
+          tmp->y = op->y + DIRY (dir) + at->y;
           tmp->map = op->map;
           if (head)
             {
               tmp->head = head;
               prev->more = tmp;
         create_treasure (head->randomitems, head, GT_INVISIBLE, op->map->difficulty, 0);
       insert_ob_in_map (head, op->map, op, 0);
       /* thought it'd be cool to insert a burnout, too. */
-      op->map->insert (archetype::get (shstr_burnout), op->x + freearr_x[dir], op->y + freearr_y[dir], op);
+      op->map->insert (archetype::get (shstr_burnout), op->x + DIRX (dir), op->y + DIRY (dir), op);
     }
 }
 /* peterm:  function which summons hostile monsters and
  * places them in nearby squares.
   { AT_PARALYZE, 9},
   { AT_FEAR, 10},
 };
 /* shuffle_attack:  peterm
  * This routine shuffles the attack of op to one of the
  * ones in the list.  It does this at random.  It also
  *  chooses a face appropriate to the attack that is
  *  being committed by that square at the moment.
  *  right now it's being used by color spray and create pool of
  *  chaos.
  * This could really be a better implementation - the
  * faces and attacktypes above are hardcoded, which is never
  * good.  The faces refer to faces in the animation sequence.
     {
       LOG (llevError, "cast_spell: null caster 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 && !caster->flag [FLAG_WIZCAST])
     {
       op->failmsg ("That spell path is denied to you.");
     }
   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
    * 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
             }
           if (spell_ob->level > caster_level)
             {
               op->failmsgf ("You lack enough skill to cast that spell! "
                             "H<Your effective cast level is %d%s, but level %d is required.>",
                             caster_level, msg, spell_ob->level);
               if (!op->is_wiz ())
                 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
    * the player any time.
    * Ignore casting time for firewalls

Diff Legend

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

Comparing deliantra/server/server/spell_util.C (file contents): Revision 1.128 by root, Wed Nov 16 23:42:03 2016 UTC vs. Revision 1.131 by root, Sat Nov 17 23:40:04 2018 UTC

Diff Legend

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.128 by root, Wed Nov 16 23:42:03 2016 UTC vs.
Revision 1.131 by root, Sat Nov 17 23:40:04 2018 UTC