--- deliantra/server/server/spell_attack.C 2007/06/04 12:19:09 1.38
+++ deliantra/server/server/spell_attack.C 2007/07/01 05:00:20 1.42
@@ -5,19 +5,18 @@
* 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 it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * 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 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 GNU General Public License
- * for more details.
+ * 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
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*
* The authors can be reached via e-mail to
*/
@@ -339,8 +338,6 @@
return 1;
}
-
-
/***************************************************************************
*
* BULLET/BALL CODE
@@ -392,7 +389,6 @@
}
}
-
/* Causes an object to explode, eg, a firebullet,
* poison cloud ball, etc. op is the object to
* explode.
@@ -614,7 +610,6 @@
* This function sets up the appropriate owner and skill
* pointers.
*/
-
int
fire_bullet (object *op, object *caster, int dir, object *spob)
{
@@ -822,7 +817,7 @@
* 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++)
{
@@ -936,7 +931,6 @@
*
****************************************************************************/
-
/* This handles an exploding bomb.
* op is the original bomb object.
*/
@@ -1049,7 +1043,6 @@
* 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)
{
@@ -1078,20 +1071,14 @@
return NULL;
if (mflags & P_IS_ALIVE)
- {
- for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
- {
- if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
- {
- return target;
- }
- }
- }
+ for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
+ if (QUERY_FLAG (target, FLAG_MONSTER))
+ return target;
}
+
return NULL;
}
-
/* cast_smite_arch() - the priest points to a creature and causes
* a 'godly curse' to decend.
* usual params -
@@ -2101,7 +2088,7 @@
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;
}