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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.61 by root, Sun Jun 24 16:11:51 2007 UTC vs.
Revision 1.65 by root, Wed Aug 1 00:26:04 2007 UTC

  *
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * Crossfire TRT is free software: you can redistribute it and/or modify
- * under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your option)
+ * the Free Software Foundation, either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
+ * This program is distributed in the hope that it will be useful,
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
+ * You should have received a copy of the GNU General Public License
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 #include <global.h>
       return 0;
     }
   if (!(random_roll (0, 3, op, PREFER_HIGH)))
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand));
-      play_sound_map (op->map, op->x, op->y, SOUND_OB_EXPLODE);
+      op->play_sound (sound_find ("ob_explode"));
       esrv_del_item (op->contr, wand->count);
       wand->destroy ();
       tmp = get_archetype ("fireball");
       tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
  * great a plus, the default is used.
  * The # of arrows created also goes up with level, so if a 30th level mage
  * wants LOTS of arrows, and doesn't care what the plus is he could
  * create nonnmagic arrows, or even -1, etc...
  */
 int
 cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg)
 {
   int missile_plus = 0, bonus_plus = 0;
   const char *missile_name;
                           && at_tmp->weight < at->weight)))
                 at = at_tmp;
             }
         }
     }
   /* Pretty unlikely (there are some very low food items), but you never
    * know
    */
   if (!at)
     {
   if (!dir)
     {
       examine_monster (op, op);
       return 1;
     }
   maxrange = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
   for (r = 1; r < maxrange; r++)
     {
       sint16 x = op->x + r * freearr_x[dir], y = op->y + r * freearr_y[dir];
                 examine_monster (op, tmp);
                 return 1;
               }
         }
     }
   new_draw_info (NDI_UNIQUE, 0, op, "You detect nothing.");
   return 1;
 }
 /* This checks to see if 'pl' is invisible to 'mon'.
  * does race check, undead check, etc
  * Returns TRUE if mon can't see pl, false
  * otherwise.  This doesn't check range, walls, etc.  It
   object *weapon, *tmp;
   char buf[MAX_BUF];
   int a, i;
   sint16 x, y;
   maptile *m;
-  materialtype_t *mt;
   if (!spell->other_arch)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
       LOG (llevError, "animate_weapon failed: spell %s missing other_arch!\n", &spell->name);
   /* attacktype */
   if (!tmp->attacktype)
     tmp->attacktype = AT_PHYSICAL;
-  mt = NULL;
-  if (op->materialname != NULL)
-    mt = name_to_material (op->materialname);
+  if (materialtype_t *mt = name_to_material (op->materialname))
-  if (mt != NULL)
     {
       for (i = 0; i < NROFATTACKS; i++)
         tmp->resist[i] = 50 - (mt->save[i] * 5);
       a = mt->save[0];
     }
     {
       for (i = 0; i < NROFATTACKS; i++)
         tmp->resist[i] = 5;
       a = 10;
     }
   /* Set weapon's immunity */
   tmp->resist[ATNR_CONFUSION] = 100;
   tmp->resist[ATNR_POISON] = 100;
   tmp->resist[ATNR_SLOW] = 100;
   tmp->resist[ATNR_PARALYZE] = 100;
   /* Improve weapon's armour value according to best save vs. physical of its material */
   if (a > 14)
     a = 14;
   tmp->resist[ATNR_PHYSICAL] = 100 - (int) ((100.0 - (float) tmp->resist[ATNR_PHYSICAL]) / (30.0 - 2.0 * a));
   /* Determine golem's speed */
   tmp->set_speed (min (3.33, 0.4 + 0.1 * SP_level_range_adjust (caster, spell)));

Diff Legend

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

Comparing deliantra/server/server/spell_effect.C (file contents): Revision 1.61 by root, Sun Jun 24 16:11:51 2007 UTC vs. Revision 1.65 by root, Wed Aug 1 00:26:04 2007 UTC

Diff Legend

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.61 by root, Sun Jun 24 16:11:51 2007 UTC vs.
Revision 1.65 by root, Wed Aug 1 00:26:04 2007 UTC