--- deliantra/server/server/spell_attack.C	2007/01/08 01:19:04	1.27
+++ deliantra/server/server/spell_attack.C	2007/03/30 21:53:09	1.31
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program 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.
-
-    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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at <crossfire@schmorp.de>
-*/
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This program 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.
+ * 
+ * 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at <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
@@ -165,7 +165,6 @@
 void
 move_bolt (object *op)
 {
-  object *tmp;
   int mflags;
   sint16 x, y;
   maptile *m;
@@ -521,7 +520,7 @@
   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))
         {
@@ -607,9 +606,6 @@
     check_bullet (op);
 }
 
-
-
-
 /* fire_bullet
  * object op (cast from caster) files a bolt in dir.
  * spob is the spell object for the bolt.
@@ -686,16 +682,12 @@
   return 1;
 }
 
-
-
-
 /*****************************************************************************
  *
  * CONE RELATED FUNCTIONS
  *
  *****************************************************************************/
 
-
 /* drops an object based on what is in the cone's "other_arch" */
 void
 cone_drop (object *op)
@@ -1485,7 +1477,6 @@
 
 }
 
-
 /**********************************************************************
  * mood change
  * Arguably, this may or may not be an attack spell.  But since it
@@ -1524,11 +1515,9 @@
   else
     race = spell->race;
 
-
   for (x = op->x - range; x <= op->x + range; x++)
     for (y = op->y - range; y <= op->y + range; y++)
       {
-
         done_one = 0;
         m = op->map;
         nx = x;
@@ -1541,7 +1530,12 @@
         if (!(mflags & P_IS_ALIVE))
           continue;
 
-        for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
+        // players can only affect spaces that they can actually see
+        if (caster && caster->contr
+            && caster->contr->visibility_at (m, nx, ny) < 70)
+          continue;
+
+        for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
           if (QUERY_FLAG (tmp, FLAG_MONSTER))
             break;
 
@@ -1558,6 +1552,7 @@
         /* Make sure the race is OK.  Likewise, only effect undead if spell specifically allows it */
         if (race && head->race && !strstr (race, head->race))
           continue;
+
         if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
           continue;
 
@@ -1604,7 +1599,7 @@
               continue;
           }
 
-        /* Done with saving throw.  Now start effecting the monster */
+        /* Done with saving throw.  Now start affecting the monster */
 
         /* aggravation */
         if (QUERY_FLAG (spell, FLAG_MONSTER))
@@ -1722,8 +1717,6 @@
    */
   for (j = 0; j < 9; j++)
     {
-      object *new_ob;
-
       hx = nx + freearr_x[j];
       hy = ny + freearr_y[j];
 
@@ -1809,7 +1802,7 @@
   // (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
@@ -2109,8 +2102,6 @@
 
                 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 */