--- deliantra/server/socket/request.C	2006/12/13 18:51:50	1.28
+++ deliantra/server/socket/request.C	2006/12/14 00:23:59	1.31
@@ -795,8 +795,9 @@
       return;
     }
 
-  packet = GetShort_String (buf);
-  repeat = GetInt_String (buf + 2);
+  packet = net_uint16 (buf);
+  repeat = net_uint32 (buf + 2);
+
   /* -1 is special - no repeat, but don't update */
   if (repeat != -1)
     pl->count = repeat;
@@ -963,7 +964,7 @@
        * requiing this minimal value reduces complexity of that code, and it
        * has been around for a long time.
        */
-      if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024)
+      if (ns->sc_version < 1026)
         {
           sprintf (version_warning, "drawinfo %d %s", NDI_RED,
                    "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
@@ -1484,7 +1485,7 @@
 
   if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
     {
-      SockList_AddShort (&sl, face_num);
+      sl << uint16 (face_num);
       if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
         esrv_send_face (&ns, face_num, 0);
 
@@ -2356,7 +2357,7 @@
   sl << "replyinfo skill_info\n";
 
   for (int i = 1; i < NUM_SKILLS; i++)
-    sl.len += sprintf ((char *)sl.buf + sl.len, "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
+    sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
 
   if (sl.len >= MAXSOCKBUF)
     {
@@ -2380,7 +2381,7 @@
   sl << "replyinfo spell_paths\n";
 
   for (int i = 0; i < NRSPELLPATHS; i++)
-    sl.len += sprintf ((char *)sl.buf + sl.len, "%d:%s\n", 1 << i, spellpathnames[i]);
+    sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
 
   if (sl.len >= MAXSOCKBUF)
     {