[ViewVC] Diff of: cvs/deliantra/server/include/newserver.h

Comparing deliantra/server/include/newserver.h (file contents):
Revision 1.21 by root, Thu Dec 14 02:37:37 2006 UTC vs.
Revision 1.22 by root, Thu Dec 14 04:30:32 2006 UTC

   int ACC (RW, current_x), ACC (RW, current_y);     // CF+ last/current map position
   char ACC (RW, client)[64];              // CF+ client name/version
   /* If we get an incomplete packet, this is used to hold the data. */
   uint8 inbuf[MAXSOCKBUF];
+  player *pl;//TODO should not be here, preferably
-  client_socket ();
+  client_socket (int fd, const char *from_ip);
   ~client_socket ();
-  void init (const char *from_ip);
   int read_packet ();                     // returns length of packet or 0
   void skip_packet (int len);             // we have processed the packet, skip it
   void send (void *buf_, int len);
 #define EMI_HASMOREBITS     0x80
 #define FACE_TYPES  1
 #define PNG_FACE_INDEX	0
-struct Socket_Info
-{
-  struct timeval timeout;       /* Timeout for select */
-  int max_filedescriptor;       /* max filedescriptor on the system */
-  int nconns;                   /* Number of connections */
-  int allocated_sockets;        /* number of allocated in init_sockets */
-};
-extern Socket_Info socket_info;
 #define VERSION_CS 1023        /* version >= 1023 understand setup cmd */
 #define VERSION_SC 1027
 #define VERSION_INFO "Crossfire+ Server"
+typedef unordered_vector<client_socket *> sockvec;
+extern sockvec client_sockets;
+extern int nrofpixmaps; //TODO: hrmpf, should go
 #endif

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines