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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.29 by root, Mon Jan 29 16:11:48 2007 UTC vs.
Revision 1.35 by root, Thu May 17 20:27:02 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  *
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
  * Copyright (C) 1992 Frank Tore Johansen
  *
   /* reduce chances of subsequent forking */
   new_bolt->stats.Dex -= 10;
   tmp->stats.Dex -= 10;         /* less forks from main bolt too */
   new_bolt->stats.Con += 25 * new_dir;  /* adjust the left bias */
-  new_bolt->speed_left = -0.1;
+  new_bolt->speed_left = -0.1f;
   new_bolt->direction = t_dir;
   new_bolt->duration++;
   new_bolt->stats.dam /= 2;     /* reduce daughter bolt damage */
   new_bolt->stats.dam++;
   tmp->stats.dam /= 2;          /* reduce father bolt damage */
  */
 void
 move_bolt (object *op)
 {
-  object *tmp;
   int mflags;
   sint16 x, y;
   maptile *m;
   if (--op->duration < 0)
       else
         {                       /* Create a copy of this object and put it ahead */
           object *tmp = op->clone ();
           m->insert (tmp, x, y, op);
-          tmp->speed_left = -0.1;
+          tmp->speed_left = -0.1f;
           /* To make up for the decrease at the top of the function */
           tmp->duration++;
           /* New forking code.  Possibly create forks of this object
            * going off in other directions.
           if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
             {
               object *tmp = op->clone ();
               tmp->state = 0;
-              tmp->speed_left = -0.21;
+              tmp->speed_left = -0.21f;
               tmp->range--;
               tmp->value = 0;
               m->insert (tmp, dx, dy, op);
             }
   /* If nothing alive on this space, no reason to do anything further */
   if (!(mflags & P_IS_ALIVE))
     return;
-  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
+  for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
     {
       if (QUERY_FLAG (tmp, FLAG_ALIVE))
         {
           dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
           if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
     }
   else
     check_bullet (op);
 }
 /* fire_bullet
  * object op (cast from caster) files a bolt in dir.
  * spob is the spell object for the bolt.
  * we remove the magic flag - that can be derived from
  * spob->attacktype.
     check_bullet (tmp);
   return 1;
 }
 /*****************************************************************************
  *
  * CONE RELATED FUNCTIONS
  *
  *****************************************************************************/
 /* drops an object based on what is in the cone's "other_arch" */
 void
 cone_drop (object *op)
 {
       return 0;
     }
   return 1;
 }
 int
 cast_destruction (object *op, object *caster, object *spell_ob)
 {
   int i, j, range, mflags, friendly = 0, dam, dur;
   sint16 sx, sy;
   else if (caster->skill)
     op->skill = caster->skill;
   else
     op->skill = NULL;
-  change_skill (op, find_skill_by_name (op, op->skill), 1);
+  op->change_skill (find_skill_by_name (op, op->skill));
   for (i = -range; i < range; i++)
     {
       for (j = -range; j < range; j++)
         {
           new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
         }
       return 1;
     }
   force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
-  force->speed = 1.0;
+  force->speed = 1.f;
-  force->speed_left = -1.0;
+  force->speed_left = -1.f;
   SET_FLAG (force, FLAG_APPLIED);
   if (god)
     {
       if (spell_ob->last_grace)
         /* aggravation */
         if (QUERY_FLAG (spell, FLAG_MONSTER))
           {
             CLEAR_FLAG (head, FLAG_SLEEP);
-            if (QUERY_FLAG (head, FLAG_FRIENDLY))
-              remove_friendly_object (head);
+            remove_friendly_object (head);
             done_one = 1;
             head->enemy = op;
           }
         /* calm monsters */
    * if this has an other_arch field, we insert that in
    * the surround spaces.
    */
   for (j = 0; j < 9; j++)
     {
-      object *new_ob;
       hx = nx + freearr_x[j];
       hy = ny + freearr_y[j];
       m = op->map;
       mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
 #if 0
   // this is bogus: it causes wrong places to be checked below
   // (a wall 2 cells away will block the effect...) and
   // doesn't work for SP_BULLET anyhow, so again tests the wrong
   // space.
-  // should be fixed later, but correctness before featurs...
+  // should be fixed later, but correctness before features...
   // (schmorp)
   /* new offset calculation to make swarm element distribution
    * more uniform
    */
                 if (disease->stats.sp)
                   disease->stats.sp -= dam_mod;
                 if (infect_object (walk, disease, 1))
                   {
-                    object *flash;      /* visual effect for inflicting disease */
                     new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
                     disease->destroy ();      /* don't need this one anymore */
                     walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
                     return 1;

Diff Legend

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

Comparing deliantra/server/server/spell_attack.C (file contents): Revision 1.29 by root, Mon Jan 29 16:11:48 2007 UTC vs. Revision 1.35 by root, Thu May 17 20:27:02 2007 UTC

Diff Legend

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.29 by root, Mon Jan 29 16:11:48 2007 UTC vs.
Revision 1.35 by root, Thu May 17 20:27:02 2007 UTC