--- deliantra/server/socket/info.C	2006/09/14 22:34:05	1.6
+++ deliantra/server/socket/info.C	2006/09/19 10:12:41	1.9
@@ -1,3 +1,4 @@
+
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -351,7 +352,7 @@
  */
 
 void
-new_info_map_except (int color, mapstruct *map, object *op, const char *str)
+new_info_map_except (int color, maptile * map, object *op, const char *str)
 {
   player *pl;
 
@@ -367,7 +368,7 @@
  */
 
 void
-new_info_map_except2 (int color, mapstruct *map, object *op1, object *op2, const char *str)
+new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
 {
   player *pl;
 
@@ -383,7 +384,7 @@
  */
 
 void
-new_info_map (int color, mapstruct *map, const char *str)
+new_info_map (int color, maptile * map, const char *str)
 {
   player *pl;
 
@@ -413,68 +414,68 @@
 {
   switch (pl->contr->shoottype)
     {
-        case range_none:
-          strcpy (obuf, "Range: nothing");
-          break;
+      case range_none:
+        strcpy (obuf, "Range: nothing");
+        break;
 
-        case range_bow:
-          {
-            object *op;
+      case range_bow:
+        {
+          object *op;
 
-            for (op = pl->inv; op; op = op->below)
-              if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
-                break;
-            if (op == NULL)
+          for (op = pl->inv; op; op = op->below)
+            if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
               break;
+          if (op == NULL)
+            break;
 
-            sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
-          }
-          break;
+          sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
+        }
+        break;
 
-        case range_magic:
-          if (settings.casting_time == TRUE)
-            {
-              if (pl->casting_time > -1)
-                {
-                  if (pl->casting_time == 0)
-                    sprintf (obuf, "Range: Holding spell (%s)", (const char *) pl->spell->name);
-                  else
-                    sprintf (obuf, "Range: Casting spell (%s)", (const char *) pl->spell->name);
-                }
-              else
-                sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
-            }
-          else
-            sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
-          break;
-
-        case range_misc:
-          sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
-          break;
-
-          /* range_scroll is only used for controlling golems.  If the
-           * the player does not have a golem, reset some things.
-           */
-        case range_golem:
-          if (pl->contr->ranges[range_golem] != NULL)
-            sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
-          else
-            {
-              pl->contr->shoottype = range_none;
-              strcpy (obuf, "Range: nothing");
-            }
-          break;
+      case range_magic:
+        if (settings.casting_time == TRUE)
+          {
+            if (pl->casting_time > -1)
+              {
+                if (pl->casting_time == 0)
+                  sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name);
+                else
+                  sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name);
+              }
+            else
+              sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
+          }
+        else
+          sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
+        break;
+
+      case range_misc:
+        sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
+        break;
+
+        /* range_scroll is only used for controlling golems.  If the
+         * the player does not have a golem, reset some things.
+         */
+      case range_golem:
+        if (pl->contr->ranges[range_golem] != NULL)
+          sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
+        else
+          {
+            pl->contr->shoottype = range_none;
+            strcpy (obuf, "Range: nothing");
+          }
+        break;
 
-        case range_skill:
-          sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
-          break;
-
-        case range_builder:
-          sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
-          break;
+      case range_skill:
+        sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
+        break;
+
+      case range_builder:
+        sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
+        break;
 
-        default:
-          strcpy (obuf, "Range: illegal");
+      default:
+        strcpy (obuf, "Range: illegal");
     }
 }
 
@@ -508,7 +509,7 @@
 {
   int x, y, dx, dy, mflags;
   sint16 nx, ny;
-  mapstruct *mp;
+  maptile *mp;
   New_Face *f;
 
   for (dx = -1; dx <= 1; dx++)
@@ -574,7 +575,7 @@
 {
   int x, y, mflags;
   sint16 nx, ny;
-  mapstruct *mp;
+  maptile *mp;
   New_Face *f;
 
   for (x = -strength; x < strength; x++)