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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.47 by root, Wed Aug 15 18:06:32 2007 UTC vs.
Revision 1.53 by root, Tue Apr 22 07:01:47 2008 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra 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 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * 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, see <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /* This file contains all the spell attack code.  Grouping this code
  * together should hopefully make it easier to find the relevent bits
  * of code
       return;
     }
   if (op->env)
     {
-      object *env = object_get_env_recursive (op);
+      object *env = op->outer_env ();
-      if (env->map == NULL || out_of_map (env->map, env->x, env->y))
+      if (!env->map || out_of_map (env->map, env->x, env->y))
         {
           LOG (llevError, "BUG: explode_bullet(): env out of map\n");
           op->destroy ();
           return;
         }
  * op is the original bomb object.
  */
 void
 animate_bomb (object *op)
 {
-  int i;
-  object *env, *tmp;
   if (op->state != NUM_ANIMATIONS (op) - 1)
     return;
-  env = object_get_env_recursive (op);
+  object *env = op->outer_env ();
   if (op->env)
     {
       if (env->map == NULL)
         return;
-      if (env->type == PLAYER)
-        esrv_del_item (env->contr, op->count);
       if (!(op = op->insert_at (env, op)))
         return;
     }
    * but using the cast_bullet isn't really feasible,
    * so just set up the appropriate values.
    */
   if (archetype *at = archetype::find (SPLINT))
     {
-      for (i = 1; i < 9; i++)
+      for (int i = 1; i < 9; i++)
         {
           if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
             continue;
-          tmp = arch_to_object (at);
+          object *tmp = arch_to_object (at);
           tmp->direction = i;
           tmp->range = op->range;
           tmp->stats.dam = op->stats.dam;
           tmp->duration = op->duration;
           tmp->attacktype = op->attacktype;
 }
 int
 create_bomb (object *op, object *caster, int dir, object *spell)
 {
   object *tmp;
   int mflags;
   sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
   maptile *m;
   if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
       return 0;
     }
   tmp = arch_to_object (spell->other_arch);
   /*  level dependencies for bomb  */
   tmp->range = spell->range + SP_level_range_adjust (caster, spell);
   tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
   m->insert (tmp, x, y, op);
   return 1;
 }
 /* cast_cause_disease:  this spell looks along <dir> from the
  * player and infects someone.
  * op is the player/monster, caster is the object, dir is the direction
  * to cast, disease_arch is the specific disease, and type is the spell number
  * perhaps this should actually be in disease.c?
  */
 int
 cast_cause_disease (object *op, object *caster, object *spell, int dir)
 {
   sint16 x, y;
   int i, mflags, range, dam_mod, dur_mod;
   /* If casting from a scroll, no direction will be available, so refer to the
    * direction the player is pointing.
    */
   if (!dir)
     dir = op->facing;
   if (!dir)
     return 0;                   /* won't find anything if casting on ourself, so just return */
   /* Calculate these once here */
   range = spell->range + SP_level_range_adjust (caster, spell);
                 /* do level adjustments */
                 if (disease->stats.wc)
                   disease->stats.wc += dur_mod / 2;
                 if (disease->magic > 0)
-                  disease->magic += dur_mod / 4;
+                  disease->magic += dur_mod / 8;
                 if (disease->stats.maxhp > 0)
                   disease->stats.maxhp += dur_mod;
                 if (disease->stats.maxgrace > 0)

Diff Legend

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

Comparing deliantra/server/server/spell_attack.C (file contents): Revision 1.47 by root, Wed Aug 15 18:06:32 2007 UTC vs. Revision 1.53 by root, Tue Apr 22 07:01:47 2008 UTC

Diff Legend

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.47 by root, Wed Aug 15 18:06:32 2007 UTC vs.
Revision 1.53 by root, Tue Apr 22 07:01:47 2008 UTC