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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.131 by root, Sat Nov 17 23:40:04 2018 UTC vs.
Revision 1.132 by root, Sun Nov 18 15:19:48 2018 UTC

   if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
     if (!tailor_god_spell (tmp, op))
       return 0;
   if (tmp->flag [FLAG_IS_TURNABLE])
-    SET_ANIMATION (tmp, dir);
+    tmp->set_anim_frame (dir);
   if ((tmp = op->map->insert (tmp, x, y, op)))
     move_spell_effect (tmp);
   return 1;
     put_a_monster (op, monstername);
   return n;
 }
 /*  Some local definitions for shuffle-attack */
 struct attacktype_shuffle
 {
   int attacktype;
   int face;
-} ATTACKS[22] =
+} ATTACKS[] =
 {
   { AT_PHYSICAL, 0},
-  { AT_PHYSICAL, 0},              /*face = explosion */
+  { AT_PHYSICAL, 0},              /* face = explosion */
   { AT_PHYSICAL, 0},
   { AT_MAGIC, 1},
   { AT_MAGIC, 1},                 /* face = last-burnout */
   { AT_MAGIC, 1},
   { AT_FIRE, 2},
  * attacktypes, which probably wasn't the intent.  MSW 2003-06-03
  */
 void
 shuffle_attack (object *op, int change_face)
 {
-  int i;
+  int i = rndm (ecb_array_length (ATTACKS));
-  i = rndm (0, 21);
   op->attacktype = ATTACKS[i].attacktype | AT_MAGIC;
   if (change_face)
-    {
+    op->set_anim_frame (ATTACKS[i].face);
-      SET_ANIMATION (op, ATTACKS[i].face);
-    }
 }
 /* prayer_failure: This is called when a player fails
  * at casting a prayer.
  * op is the player.

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