--- deliantra/server/socket/request.C	2006/09/14 23:13:49	1.20
+++ deliantra/server/socket/request.C	2006/09/19 10:12:50	1.22
@@ -260,7 +260,7 @@
       buf += 8;
 
       // initial map and its origin
-      mapstruct *map = pl->ob->map;
+      maptile *map = pl->ob->map;
       sint16 dx, dy;
       int mapx = pl->socket.mapx / 2 - pl->ob->x;
       int mapy = pl->socket.mapy / 2 - pl->ob->y;
@@ -1133,6 +1133,7 @@
       AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
       AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
     }
+
   if (pl->socket.exp64)
     {
       uint8 s;
@@ -1152,14 +1153,12 @@
             }
         }
     }
+
   if (pl->socket.exp64)
-    {
-      AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
-    }
+    AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
   else
-    {
-      AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP);
-    }
+    AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP);
+
   AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
   AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
   AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
@@ -1169,16 +1168,17 @@
   AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
   AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
   flags = 0;
+
   if (pl->fire_on)
     flags |= SF_FIREON;
+
   if (pl->run_on)
     flags |= SF_RUNON;
 
   AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
+
   if (pl->socket.sc_version < 1025)
-    {
-      AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR);
-    }
+    AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR);
   else
     {
       int i;
@@ -1191,12 +1191,14 @@
           AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
         }
     }
+
   if (pl->socket.monitor_spells)
     {
       AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
       AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
       AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
     }
+
   rangetostring (pl->ob, buf);  /* we want use the new fire & run system in new client */
   AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);
   set_title (pl->ob, buf);
@@ -1543,7 +1545,7 @@
  */
 
 static int
-update_space (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer)
+update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
 {
   object *ob, *head;
   uint16 face_num;
@@ -1767,7 +1769,7 @@
  */
 
 static inline int
-update_smooth (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer)
+update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
 {
   object *ob;
   int smoothlevel;              /* old face_num; */
@@ -1855,7 +1857,7 @@
   uint8 eentrysize;
   uint16 ewhatstart, ewhatflag;
   uint8 extendedinfos;
-  mapstruct *m;
+  maptile *m;
 
   NewSocket & socket = pl->contr->socket;
 
@@ -2243,7 +2245,7 @@
   New_Face *floor2;
   int d, mflags;
   struct Map newmap;
-  mapstruct *m, *pm;
+  maptile *m, *pm;
 
   if (pl->type != PLAYER)
     {