--- deliantra/server/server/spell_attack.C	2011/04/23 04:56:57	1.106
+++ deliantra/server/server/spell_attack.C	2012/01/27 22:00:40	1.110
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  * 
@@ -1111,9 +1111,7 @@
 {
   object *effect, *target;
   object *god = find_god (determine_god (op));
-  int range;
 
-  range = spell->range + SP_level_range_adjust (caster, spell);
   target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA);
 
   /* Bunch of conditions for casting this spell.  Note that only 
@@ -1266,7 +1264,7 @@
   if (op->path_denied & PATH_LIGHT)
     return 0;
 
-  object *tmp = get_archetype (FORCE_NAME);
+  object *tmp = archetype::get (FORCE_NAME);
   tmp->set_speed (0.01);
   tmp->stats.food = time;
   tmp->set_flag (FLAG_IS_USED_UP);
@@ -1364,7 +1362,7 @@
 
   if (!force)
     {
-      force = get_archetype (FORCE_NAME);
+      force = archetype::get (FORCE_NAME);
       force->subtype = FORCE_CHANGE_ABILITY;
 
       if (spell_ob->race)
@@ -1463,7 +1461,7 @@
       mapspace &ms = m->at (nx, ny);
 
       /* If there is nothing living on this space, no need to go further */
-      if (!ms.flags () & P_IS_ALIVE)
+      if (!(ms.flags () & P_IS_ALIVE))
         continue;
 
       // players can only affect spaces that they can actually see
@@ -2010,7 +2008,7 @@
                     op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
 
                     disease->destroy ();      /* don't need this one anymore */
-                    walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);
+                    walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
                     return 1;
                   }