--- deliantra/server/server/spell_util.C	2006/12/20 02:15:49	1.23
+++ deliantra/server/server/spell_util.C	2006/12/20 09:14:22	1.24
@@ -443,7 +443,7 @@
 
   if (OUT_OF_REAL_MAP (m, x, y))
     return 0;
-  for (op = get_map_ob (m, x, y); op != NULL; op = op->above)
+  for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
     if (QUERY_FLAG (op, FLAG_REFL_SPELL)
         && (!QUERY_FLAG (op, FLAG_ALIVE)
             || sp_op->type == LIGHTNING // XXX: elmex: why is LIGHTNING special cased here?
@@ -509,7 +509,7 @@
   if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (mp, x, y)))
     return 0;
 
-  for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above)
+  for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above)
     {
       /* If there is a counterspell on the space, and this
        * object is using magic, don't progress.  I believe we could
@@ -701,14 +701,14 @@
         tmp = NULL;
       else
         {
-          for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
+          for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
             if (tmp->type == PLAYER)
               break;
         }
     }
   /* didn't find a player there, look in current square for a player */
   if (tmp == NULL)
-    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 (tmp->type == PLAYER)
           break;
@@ -754,7 +754,7 @@
       if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW))
         continue;
 
-      tmp = get_map_ob (mp, nx, ny);
+      tmp = GET_MAP_OB (mp, nx, ny);
 
       while (tmp != NULL && (((owner_type == PLAYER &&
                                !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) ||