--- deliantra/server/server/spell_attack.C	2006/09/14 23:13:49	1.14
+++ deliantra/server/server/spell_attack.C	2006/09/16 22:24:13	1.15
@@ -119,7 +119,7 @@
 {
   int new_dir = 1;              /* direction or -1 for left, +1 for right 0 if no new bolt */
   int t_dir;                    /* stores temporary dir calculation */
-  mapstruct *m;
+  maptile *m;
   sint16 sx, sy;
   object *new_bolt;
 
@@ -172,7 +172,7 @@
   object *tmp;
   int mflags;
   sint16 x, y;
-  mapstruct *m;
+  maptile *m;
 
   if (--(op->duration) < 0)
     {
@@ -358,7 +358,7 @@
 explosion (object *op)
 {
   object *tmp;
-  mapstruct *m = op->map;
+  maptile *m = op->map;
   int i;
 
   if (--(op->duration) < 0)
@@ -523,7 +523,7 @@
 {
   object *tmp;
   int dam, mflags;
-  mapstruct *m;
+  maptile *m;
   sint16 sx, sy;
 
   mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
@@ -572,7 +572,7 @@
 {
   sint16 new_x, new_y;
   int mflags;
-  mapstruct *m;
+  maptile *m;
 
 #if 0
   /* We need a better general purpose way to do this */
@@ -849,7 +849,7 @@
 {
   object *tmp;
   int i, success = 0, range_min = -1, range_max = 1;
-  mapstruct *m;
+  maptile *m;
   sint16 sx, sy;
   MoveType movetype;
 
@@ -1072,7 +1072,7 @@
   object *tmp;
   int mflags;
   sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
-  mapstruct *m;
+  maptile *m;
 
   mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
   if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
@@ -1118,7 +1118,7 @@
   object *target;
   sint16 x, y;
   int dist, mflags;
-  mapstruct *mp;
+  maptile *mp;
 
   if (dir == 0)
     return NULL;
@@ -1268,7 +1268,7 @@
   int i, mflags;
   object *owner;
   sint16 new_x, new_y;
-  mapstruct *m;
+  maptile *m;
 
   if (op->range-- <= 0)
     {
@@ -1380,7 +1380,7 @@
 {
   int i, j, range, mflags, friendly = 0, dam, dur;
   sint16 sx, sy;
-  mapstruct *m;
+  maptile *m;
   object *tmp;
   const char *skill;
 
@@ -1572,7 +1572,7 @@
   object *tmp, *god, *head;
   int done_one, range, mflags, level, at, best_at;
   sint16 x, y, nx, ny;
-  mapstruct *m;
+  maptile *m;
   const char *race;
 
   /* We precompute some values here so that we don't have to keep
@@ -1746,7 +1746,7 @@
   int i, j, dam_save, dir, mflags;
   sint16 nx, ny, hx, hy;
   object *owner;
-  mapstruct *m;
+  maptile *m;
 
   owner = get_owner (op);
 
@@ -1868,7 +1868,7 @@
   static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
   sint16 target_x, target_y, origin_x, origin_y;
   int adjustdir;
-  mapstruct *m;
+  maptile *m;
 #endif
   int basedir;
   object *owner;
@@ -2021,7 +2021,7 @@
   object *target = NULL, *tmp = NULL;
   sint16 x, y;
   int dam, mflags;
-  mapstruct *m;
+  maptile *m;
 
   dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
 
@@ -2099,7 +2099,7 @@
   sint16 x, y;
   int i, mflags, range, dam_mod, dur_mod;
   object *walk;
-  mapstruct *m;
+  maptile *m;
 
   x = op->x;
   y = op->y;