--- deliantra/server/server/spell_attack.C	2006/12/18 02:35:01	1.20
+++ deliantra/server/server/spell_attack.C	2006/12/20 09:14:22	1.21
@@ -59,7 +59,7 @@
       /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
     }
 
-  for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
+  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
     {
       int num_sections = 1;
 
@@ -538,7 +538,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 = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
     {
       if (QUERY_FLAG (tmp, FLAG_ALIVE))
         {
@@ -1125,7 +1125,7 @@
 
       if (mflags & P_IS_ALIVE)
         {
-          for (target = get_map_ob (mp, x, y); target; target = target->above)
+          for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
             {
               if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
                 {
@@ -1399,7 +1399,7 @@
             continue;
           if (mflags & P_IS_ALIVE)
             {
-              for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above)
+              for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
                 {
                   if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
                     break;
@@ -1593,7 +1593,7 @@
         if (!(mflags & P_IS_ALIVE))
           continue;
 
-        for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above)
+        for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
           if (QUERY_FLAG (tmp, FLAG_MONSTER))
             break;
 
@@ -2026,7 +2026,7 @@
 
   if (mflags & P_IS_ALIVE && spell->attacktype)
     {
-      for (target = get_map_ob (m, x, y); target; target = target->above)
+      for (target = GET_MAP_OB (m, x, y); target; target = target->above)
         if (QUERY_FLAG (target, FLAG_MONSTER))
           {
             /* oky doky. got a target monster. Lets make a blinding attack */
@@ -2118,7 +2118,7 @@
       if (mflags & P_IS_ALIVE)
         {
           /* search this square for a victim */
-          for (walk = get_map_ob (m, x, y); walk; walk = walk->above)
+          for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
             if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
               {                 /* found a victim */
                 object *disease = arch_to_object (spell->other_arch);