--- deliantra/server/socket/request.C	2007/04/02 18:04:47	1.83
+++ deliantra/server/socket/request.C	2007/04/24 00:42:03	1.88
@@ -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;
@@ -507,6 +500,7 @@
 AskSmooth (char *buf, int len, client *ns)
 {
   ns->send_face (atoi (buf));
+  ns->flush_fx ();
 }
 
 /**
@@ -619,10 +613,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;
@@ -1191,10 +1181,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])
@@ -1245,7 +1235,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)
@@ -1329,6 +1319,8 @@
         }                       /* for x loop */
     }                           /* for y loop */
 
+  socket.flush_fx ();
+
   /* Verify that we in fact do need to send this */
   if (socket.ext_mapinfos)
     {