--- deliantra/server/socket/request.C	2007/04/03 00:21:38	1.84
+++ deliantra/server/socket/request.C	2007/04/27 00:49:58	1.90
@@ -150,14 +150,7 @@
   object *ob = pl->ob;
   char buf[MAX_BUF];            /* eauugggh */
 
-  if (socket.force_newmap)
-    {
-      // force newmap is used for clients that do not redraw their map
-      // after image uploads.
-      socket.current_map = ob->map;
-      clear_map (pl);
-    }
-  else if (socket.current_map != ob->map)
+  if (socket.current_map != ob->map || socket.force_newmap)
     {
       clear_map (pl);
       socket.current_map = ob->map;
@@ -168,14 +161,10 @@
             {
               int flags = 0;
 
-              if (ob->map->tile_path[0])
-                flags |= 1;
-              if (ob->map->tile_path[1])
-                flags |= 2;
-              if (ob->map->tile_path[2])
-                flags |= 4;
-              if (ob->map->tile_path[3])
-                flags |= 8;
+              if (ob->map->tile_path[0]) flags |= 1;
+              if (ob->map->tile_path[1]) flags |= 2;
+              if (ob->map->tile_path[2]) flags |= 4;
+              if (ob->map->tile_path[3]) flags |= 8;
 
               snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
                         flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
@@ -334,14 +323,10 @@
         {
           int flags = 0;
 
-          if (map->tile_path[0])
-            flags |= 1;
-          if (map->tile_path[1])
-            flags |= 2;
-          if (map->tile_path[2])
-            flags |= 4;
-          if (map->tile_path[3])
-            flags |= 8;
+          if (map->tile_path[0]) flags |= 1;
+          if (map->tile_path[1]) flags |= 2;
+          if (map->tile_path[2]) flags |= 4;
+          if (map->tile_path[3]) flags |= 8;
 
           snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
         }
@@ -620,10 +605,6 @@
         LOG (llevError, "Got reply message with ST_PLAYING input state\n");
         break;
 
-      case ST_CHANGE_CLASS:
-        key_change_class (pl->ob, buf[0]);
-        break;
-
       case ST_GET_PARTY_PASSWORD:    /* Get password for party */
         receive_party_password (pl->ob, 13);
         break;
@@ -672,7 +653,7 @@
 
   if (cp)
     {
-      assign (ns->version, cp + 1);
+      ns->version = cp + 1;
 
       if (ns->sc_version < 1026)
         ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
@@ -1192,10 +1173,10 @@
 
               if (socket.extmap)
                 {
-                  uint8 stat_hp = 0;
+                  uint8 stat_hp    = 0;
                   uint8 stat_width = 0;
-                  uint8 flags = 0;
-                  UUID player = 0;
+                  uint8 flags      = 0;
+                  tag_t player     = 0;
 
                   // send hp information, if applicable
                   if (object *op = ms.faces_obj [0])
@@ -1246,7 +1227,7 @@
                       *last_ext |= 0x80;
                       last_ext = &sl[sl.length ()];
 
-                      sl << uint8 (0x47) << uint8 (8) << (uint64)player;
+                      sl << uint8 (0x47) << uint8 (4) << (uint32)player;
                     }
 
                   if (lastcell.flags != flags)