--- deliantra/server/include/client.h 2007/01/06 14:42:30 1.23 +++ deliantra/server/include/client.h 2007/03/12 01:13:10 1.33 @@ -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 { @@ -94,15 +87,16 @@ ST_PLAYING, // logged in an playing ST_CUSTOM, // waiting for custom reply - ST_CONFIRM_QUIT, ST_CHANGE_CLASS, ST_GET_PARTY_PASSWORD, }; // 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 @@ -170,15 +164,26 @@ { 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) */ uint8 ACC (RW, state); /* Input state of the player (name, password, etc */ - uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ + + 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_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 */ + uint32 ACC (RW, last_path_denied); /* Last spell denied sent to client */ + living ACC (RO, last_stats); /* Last stats as sent to client */ + float ACC (RW, last_speed); /* Last speed as sent to client */ + sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */ + sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */ bool ACC (RW, afk); /* player is afk */ bool ACC (RW, facecache); /* If true, client is caching images */ @@ -207,11 +212,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); @@ -220,14 +226,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]; @@ -239,6 +247,8 @@ MTH bool handle_command (); // resets movement state MTH void reset_state (); + // resets variable data used to send stat diffs + MTH void reset_stats (); MTH bool handle_packet (); int next_packet (); // returns length of packet or 0 @@ -306,13 +316,17 @@ #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 unordered_vector sockvec; +typedef object_vector sockvec; extern sockvec clients; -extern int nrofpixmaps; //TODO: hrmpf, should go + +#define for_all_clients(var) \ + for (int _i = 0; _i < clients.size (); ++_i) \ + declvar (client *, var, clients [_i]) #endif