--- deliantra/server/include/client.h 2007/01/08 18:18:35 1.25 +++ deliantra/server/include/client.h 2007/03/14 00:04:58 1.35 @@ -1,26 +1,26 @@ /* - CrossFire, A Multiplayer game for the X Window System - - Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - Copyright (C) 1992 Frank Tore Johansen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - The author can be reached via e-mail to crossfire@schmorp.de -*/ + * CrossFire, A Multiplayer game for the X Window System + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * Copyright (C) 2002 Mark Wedel & Crossfire Development Team + * Copyright (C) 1992 Frank Tore Johansen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * The author can be reached via e-mail to crossfire@schmorp.de + */ #ifndef CLIENT_H #define CLIENT_H @@ -36,21 +36,14 @@ { UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient int count; /* This is really darkness in the map1 command */ - uint16 faces[MAP_LAYERS]; + faceidx faces[MAP_LAYERS]; uint16 smooth[MAP_LAYERS]; unsigned char stat_hp; // health of something in this space, or 0 unsigned char flags; }; -/* This basically defines the largest size an - * archetype may be - it is used for allocation of - * some structures, as well as determining how far - * we should look for the heads of big images. - */ -#define MAX_HEAD_OFFSET 8 - -#define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET) -#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET) +#define MAX_CLIENT_X MAP_CLIENT_X +#define MAX_CLIENT_Y MAP_CLIENT_Y struct Map { @@ -58,7 +51,7 @@ }; /* True max is 16383 given current map compaction method */ -# define MAXANIMNUM 2000 +#define MAXANIMNUM 10000 struct statsinfo { @@ -100,8 +93,10 @@ // a handler for a specific type of packet enum { - PF_PLAYER = 0x01, // must have valid player / will by synchronised - PF_PLAYING = 0x02, // must be in playing state + PF_PLAYER = 0x01, // must have valid player / will by synchronised + PF_PLAYING = 0x02, // must be in playing state + PF_COMMAND0 = 0x04, // command starts at offset 0 + PF_COMMAND6 = 0x08, // command starts at offset 6 }; struct packet_type @@ -169,11 +164,9 @@ { int ACC (RW, fd); unsigned int inbuf_len; // number of bytes valid in inbuf - uint8 *faces_sent; // This is a bitmap on sent face status 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) */ @@ -202,6 +195,8 @@ bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */ + bool ACC (RW, force_face0); /* CF+ client workaround for buggy checksum calculation in gcfclient */ + bool ACC (RW, force_bad_checksum); /* CF+ client workaround for buggy checksum calculation in gcfclient */ bool ACC (RW, darkness); /* True if client wants darkness information */ bool ACC (RW, image2); /* Client wants image2/face2 commands */ bool ACC (RW, update_look); /* If true, we need to send the look window */ @@ -219,11 +214,12 @@ uint16 ACC (RW, look_position); /* start of drawing of look window */ uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ - 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 + uint8 ACC (RW, faceset); // CF+ selected faceset player_ptr ACC (RO, pl); @@ -232,14 +228,16 @@ 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; // large structures at the end please struct Map lastmap; std::bitset anims_sent; + uint8 ACC (RW, faces_sent[MAX_FACES]); // This is a bitmap on sent face status // if we get an incomplete packet, this is used to hold the data. // we add 2 byte for the header, one for the trailing 0 byte uint8 inbuf[MAXSOCKBUF + 2 + 1]; @@ -267,6 +265,12 @@ void send_packet_printf (const char *format, ...); void send_packet (packet &sl); + void send_drawinfo (const char *msg, int flags = NDI_BLACK); + MTH void send_face (faceidx facenum, bool nocache = false); + MTH void send_faces (object *ob); + MTH void send_smooth (faceidx facenum); + MTH void send_animation (short anim_num); + // called when something under the player changes MTH void floorbox_update () { update_look = 1; } // called when the player has been moved @@ -320,7 +324,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; @@ -331,7 +336,5 @@ for (int _i = 0; _i < clients.size (); ++_i) \ declvar (client *, var, clients [_i]) -extern int nrofpixmaps; //TODO: hrmpf, should go - #endif