[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.44 by root, Sun Jul 22 14:17:58 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /* This file contains all the spell attack code.  Grouping this code
  * together should hopefully make it easier to find the relevent bits
  * of code
   /* 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.
     move_bolt (tmp);
   return 1;
 }
 /***************************************************************************
  *
  * BULLET/BALL CODE
  *
  ***************************************************************************/
           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);
             }
         }
     }
 }
 /* Causes an object to explode, eg, a firebullet,
  * poison cloud ball, etc.  op is the object to
  * explode.
  */
   /* 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.
  * This function sets up the appropriate owner and skill
  * pointers.
  */
 int
 fire_bullet (object *op, object *caster, int dir, object *spob)
 {
   object *tmp = NULL;
   int mflags;
     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)
 {
   /* Need to know what the movetype of the object we are about
    * to create is, so we can know if the space we are about to
    * insert it into is blocked.
    */
-  movetype = spell->other_arch->clone.move_type;
+  movetype = spell->other_arch->move_type;
   for (i = range_min; i <= range_max; i++)
     {
       sint16 x, y, d;
           else
             tmp->duration += caster->level / 3;
         }
       if (!(tmp->move_type & MOVE_FLY_LOW))
-        LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);
+        LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->archname);
       if (!tmp->move_on && tmp->stats.dam)
-        LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);
+        LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->archname);
       m->insert (tmp, sx, sy, op);
       /* This is used for tracking spells so that one effect doesn't hit
        * a single space too many times.
 /****************************************************************************
  *
  * BOMB related code
  *
  ****************************************************************************/
 /* This handles an exploding bomb.
  * op is the original bomb object.
  */
 void
  * dir is the direction to look in.
  * range is how far out to look.
  * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
  * this info is used for blocked magic/unholy spaces.
  */
 object *
 get_pointed_target (object *op, int dir, int range, int type)
 {
   object *target;
   sint16 x, y;
         return NULL;
       if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
         return NULL;
       if (mflags & P_IS_ALIVE)
-        {
-          for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
+        for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
-            {
+          if (QUERY_FLAG (target, FLAG_MONSTER))
-              if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
-                {
-                  return target;
+            return target;
-                }
-            }
-        }
     }
   return NULL;
 }
 /* cast_smite_arch() - the priest points to a creature and causes
  * a 'godly curse' to decend.
  * usual params -
  * op = player
  * caster = object casting the spell.
  * dir = direction being cast
  * spell = spell object
  */
 int
 cast_smite_spell (object *op, object *caster, int dir, object *spell)
 {
   object *effect, *target;
   object *god = find_god (determine_god (op));
  * we do this by creating a force and inserting it in the
  * object. if time is 0, the object glows permanently. To truely
  * make this work for non-living objects, we would have to
  * give them the capability to have an inventory. b.t.
  */
 int
 make_object_glow (object *op, int radius, int time)
 {
-  object *tmp;
   /* some things are unaffected... */
   if (op->path_denied & PATH_LIGHT)
     return 0;
-  tmp = get_archetype (FORCE_NAME);
+  object *tmp = get_archetype (FORCE_NAME);
   tmp->speed = 0.01;
   tmp->stats.food = time;
   SET_FLAG (tmp, FLAG_IS_USED_UP);
   tmp->glow_radius = radius;
   if (tmp->glow_radius > MAX_LIGHT_RADII)
     tmp->glow_radius = MAX_LIGHT_RADII;
-  tmp->x = op->x;
-  tmp->y = op->y;
-  if (tmp->speed < MIN_ACTIVE_SPEED)
-    tmp->speed = MIN_ACTIVE_SPEED;      /* safety */
   tmp = insert_ob_in_ob (tmp, op);
   if (tmp->glow_radius > op->glow_radius)
     op->glow_radius = tmp->glow_radius;
-  if (!tmp->env || op != tmp->env)
-    {
-      LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
-      return 0;
-    }
   return 1;
 }
 int
 cast_destruction (object *op, object *caster, object *spell_ob)
 {
   int i, j, range, mflags, friendly = 0, dam, dur;
   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)
             at -= level / 5;
             if (did_make_save (head, head->level, at))
               continue;
           }
         else                    /* spell->attacktype */
-          /*
-             Spell has no attacktype (charm & such), so we'll have a specific saving:
-             * if spell level < monster level, no go
-             * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
-             The chance will then be in the range [20-70] percent, not too bad.
-             This is required to fix the 'charm monster' abuse, where a player level 1 can
-             charm a level 125 monster...
-             Ryo, august 14th
-           */
           {
+            /*
+               Spell has no attacktype (charm & such), so we'll have a specific saving:
+               * if spell level < monster level, no go
+               * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
+               The chance will then be in the range [20-70] percent, not too bad.
+               This is required to fix the 'charm monster' abuse, where a player level 1 can
+               charm a level 125 monster...
+               Ryo, august 14th
+            */
             if (head->level > level)
               continue;
             if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
               /* Failed, no effect */
               continue;
           }
         /* 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);
+                    walk->map->insert (get_archetype ("detect_magic"), x, y, op);
                     return 1;
                   }
                 disease->destroy ();
               }

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.44 by root, Sun Jul 22 14:17:58 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.44 by root, Sun Jul 22 14:17:58 2007 UTC