--- deliantra/server/include/client.h	2007/11/08 19:43:24	1.69
+++ deliantra/server/include/client.h	2008/04/22 07:01:46	1.75
@@ -31,37 +31,37 @@
 #if HAVE_TCP_INFO
 # include <netinet/tcp.h>
 #else
-  struct tcpi_info {
+  struct tcp_info {
     // dummy
-    char tcpi_state;
-    char tcpi_ca_state;
-    char tcpi_retransmits;
-    char tcpi_probes;
-    char tcpi_backoff;
-    char tcpi_options;
-    char tcpi_snd_wscale;
-    char tcpi_rcv_wscale;
-    char tcpi_rto;
-    char tcpi_ato;
-    char tcpi_snd_mss;
-    char tcpi_rcv_mss;
-    char tcpi_unacked;
-    char tcpi_sacked;
-    char tcpi_lost;
-    char tcpi_retrans;
-    char tcpi_fackets;
-    char tcpi_last_data_sent;
-    char tcpi_last_ack_sent;
-    char tcpi_last_data_recv;
-    char tcpi_last_ack_recv;
-    char tcpi_pmtu;
-    char tcpi_rcv_ssthresh;
-    char tcpi_rtt;
-    char tcpi_rttvar;
-    char tcpi_snd_ssthresh;
-    char tcpi_snd_cwnd;
-    char tcpi_advmss;
-    char tcpi_reordering;
+    int tcpi_state;
+    int tcpi_ca_state;
+    int tcpi_retransmits;
+    int tcpi_probes;
+    int tcpi_backoff;
+    int tcpi_options;
+    int tcpi_snd_wscale;
+    int tcpi_rcv_wscale;
+    int tcpi_rto;
+    int tcpi_ato;
+    int tcpi_snd_mss;
+    int tcpi_rcv_mss;
+    int tcpi_unacked;
+    int tcpi_sacked;
+    int tcpi_lost;
+    int tcpi_retrans;
+    int tcpi_fackets;
+    int tcpi_last_data_sent;
+    int tcpi_last_ack_sent;
+    int tcpi_last_data_recv;
+    int tcpi_last_ack_recv;
+    int tcpi_pmtu;
+    int tcpi_rcv_ssthresh;
+    int tcpi_rtt;
+    int tcpi_rttvar;
+    int tcpi_snd_ssthresh;
+    int tcpi_snd_cwnd;
+    int tcpi_advmss;
+    int tcpi_reordering;
   };
 #endif
 
@@ -146,11 +146,6 @@
   const packet_type *handler;
   char *data;
   int datalen;
-
-  ~command ()
-  {
-    sfree<char> (data, datalen + 1);
-  }
 };
 
 /* how many times we are allowed to give the wrong password before being kicked. */
@@ -181,7 +176,7 @@
   sint8 ACC (RW, last_level);             /* Last level we sent to client */
   uint16 ACC (RW, last_flags);            /* fire/run on flags for last tick */
   float ACC (RW, last_weapon_sp);         /* if diff than weapon_sp, update client */
-  sint32 ACC (RW, last_weight);           /* Last weight as sent to client; -1 means do not send weight */
+  //sint32 ACC (RW, last_weight);           /* Last weight as sent to client; -1 means do not send weight */
   sint32 ACC (RW, last_weight_limit);     /* Last weight limit transmitted to client */
   uint32 ACC (RW, last_path_attuned);     /* Last spell attunment sent to client */
   uint32 ACC (RW, last_path_repelled);    /* Last spell repelled sent to client */
@@ -263,7 +258,7 @@
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
-  iow socket_ev; void socket_cb (iow &w, int got);
+  iow socket_ev; void socket_cb (iow &w, int revents);
 
   std::deque< command, slice_allocator<command> > cmd_queue;