--- deliantra/server/include/client.h 2007/02/04 21:02:54 1.28 +++ deliantra/server/include/client.h 2007/03/10 19:48:16 1.31 @@ -175,7 +175,6 @@ statsinfo stats; int ACC (RO, active); - client_container cc_inv, cc_other; Buffer outputbuffer; char *ACC (RW, host); /* Which host it is connected from (ip address) */ @@ -224,6 +223,7 @@ uint8 ACC (RW, faceset); /* Set the client is using, default 0 */ maptile *ACC (RW, current_map); // CF+ last/current player map + region *ACC (RW, current_region); // CF+ last/current player region int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position char ACC (RW, version)[64]; // CF+ client name/version @@ -234,8 +234,9 @@ void do_destroy (); void gather_callbacks (AV *&callbacks, event_type event) const; - iw cmd_ev; void cmd_cb (iw &w); iow socket_ev; void socket_cb (iow &w, int got); + iw cmd_ev; void cmd_cb (iw &w); + client_container cc_inv, cc_other; std::deque< command, slice_allocator > cmd_queue; @@ -322,7 +323,8 @@ #define PNG_FACE_INDEX 0 #define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ -#define VERSION_SC 1027 +#define VERSION_SC 1026 +//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible #define VERSION_INFO "Crossfire+ Server" typedef object_vector sockvec;