ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/client.h
(Generate patch)

Comparing deliantra/server/include/client.h (file contents):
Revision 1.5 by root, Sat Dec 16 03:21:08 2006 UTC vs.
Revision 1.13 by root, Wed Dec 20 09:14:22 2006 UTC

… …
23 23
24#ifndef CLIENT_H 24#ifndef CLIENT_H
25#define CLIENT_H 25#define CLIENT_H
26 26
27#include <deque> 27#include <deque>
28#include <bitset>
29#include <tr1/unordered_set>
28 30
29// (possibly) max. number of objects "per page" in the ground container 31// (possibly) max. number of objects "per page" in the ground container
30#define NUM_LOOK_OBJECTS 50 32#define FLOORBOX_PAGESIZE 50
31 33
32struct MapCell 34struct MapCell
33{ 35{
34 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient 36 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
35 int count; /* This is really darkness in the map1 command */ 37 int count; /* This is really darkness in the map1 command */
… …
74 * instead of having a bunch of different fields that needed to 76 * instead of having a bunch of different fields that needed to
75 * get toggled. 77 * get toggled.
76 */ 78 */
77enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 79enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
78 80
79/* The following is the setup for a ring buffer for storing outbut 81/* The following is the setup for a ring buffer for storing output
80 * data that the OS can't handle right away. 82 * data that the OS can't handle right away.
81 */ 83 */
82 84
83struct Buffer 85struct Buffer
84{ 86{
… …
87 int len; 89 int len;
88}; 90};
89 91
90// a handler for a specific type of packet 92// a handler for a specific type of packet
91enum { 93enum {
92 PF_PLAYER = 0x01, // must have valid player 94 PF_PLAYER = 0x01, // must have valid player / will by synchronised
93 PF_IMMEDIATE = 0x02, // TODO: hack, can be executed immediately
94 PF_PLAYING = 0x04, // must be in playing state 95 PF_PLAYING = 0x02, // must be in playing state
95}; 96};
96 97
97struct packet_type 98struct packet_type
98{ 99{
99 const char *name; 100 const char *name;
… …
106 tstamp stamp; 107 tstamp stamp;
107 const packet_type *handler; 108 const packet_type *handler;
108 char *data; 109 char *data;
109 int datalen; 110 int datalen;
110 111
111 command (tstamp stamp, const packet_type *handler, char *data, int datalen) 112 ~command ()
112 : stamp (stamp), handler (handler), data (data), datalen (datalen)
113 { 113 {
114 sfree<char> (data, datalen + 1);
114 } 115 }
116};
117
118struct refitem
119{
120 object_ptr op;
121};
122
123// this represents a container on the client side.
124// right now, there are only ever two of them:
125// the inventory and the floor/open container
126//TODO: unused as of yet
127struct client_container : vector< refitem, slice_allocator<refitem> >
128{
129 client *ns;
130 enum { CC_NONE, CC_INVENTORY, CC_MAPSPACE, CC_CONTAINER } type;
131
132 bool item_changed; // one of the items in here possibly changed
133
134 // for mapspace and container
135 int x, y;
136 maptile *map;
137
138 // for container
139 object *env;
140
141 client_container (client *ns)
142 : ns (ns), type (CC_NONE) { }
143
144 tag_t tag () const;
145
146 inline iterator merge_item (iterator i, object *op);
147
148 void clear ();
149 void update ();
150
151 void set_mapspace (maptile *map, int x, int y);
152 void set_container (object *env);
115}; 153};
116 154
117/* how many times we are allowed to give the wrong password before being kicked. */ 155/* how many times we are allowed to give the wrong password before being kicked. */
118#define MAX_PASSWORD_FAILURES 5 156#define MAX_PASSWORD_FAILURES 5
119 157
… …
121struct client : zero_initialised, attachable_base 159struct client : zero_initialised, attachable_base
122{ 160{
123 enum Sock_Status status; 161 enum Sock_Status status;
124 int ACC (RW, fd); 162 int ACC (RW, fd);
125 unsigned int inbuf_len; // number of bytes valid in inbuf 163 unsigned int inbuf_len; // number of bytes valid in inbuf
126 struct Map lastmap;
127 size_t faces_sent_len; /* This is the number of elements allocated in faces_sent[] */
128 uint8 *faces_sent; /* This is a bitmap on sent face status */ 164 uint8 *faces_sent; // This is a bitmap on sent face status
129 uint8 anims_sent[MAXANIMNUM]; 165 statsinfo stats;
130 struct statsinfo stats; 166
167 client_container cc_inv, cc_other;
131 168
132 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 169 char *ACC (RW, host); /* Which host it is connected from (ip address) */
133 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ 170 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */
134 Buffer outputbuffer; /* For undeliverable data */ 171 Buffer outputbuffer;
135 172
136 bool ACC (RW, facecache); /* If true, client is caching images */ 173 bool ACC (RW, facecache); /* If true, client is caching images */
137 bool ACC (RW, sent_scroll); 174 bool ACC (RW, sent_scroll);
138 bool ACC (RW, sound); /* does the client want sound */ 175 bool ACC (RW, sound); /* does the client want sound */
139 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */ 176 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */
140 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ 177 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
141 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */ 178 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */
142 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */ 179 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */
143 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 180 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */
144 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 181 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */
145 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */ 182 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */
146 bool ACC (RW, darkness); /* True if client wants darkness information */ 183 bool ACC (RW, darkness); /* True if client wants darkness information */
147 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 184 bool ACC (RW, image2); /* Client wants image2/face2 commands */
148 bool ACC (RW, update_look); /* If true, we need to send the look window */ 185 bool ACC (RW, update_look); /* If true, we need to send the look window */
149 bool ACC (RW, has_readable_type); /* If true client accept additional text information */ 186 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
150 /* used to arrange text in books, scrolls, or scripted dialogs */ 187 /* used to arrange text in books, scrolls, or scripted dialogs */
151 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */ 188 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */
152 bool ACC (RW, ext_mapinfos); /* If true client accept additionnal info on maps */ 189 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */
153 /* Below are flags for extedend infos to pass to client 190 /* Below are flags for extedend infos to pass to client
154 * with S->C mapextended command */ 191 * with S->C mapextended command */
155 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */ 192 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
156 193
157 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ 194 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
158 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 195 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
159 enum MapMode mapmode; /* Type of map commands the client wants. */ 196 enum MapMode mapmode; /* Type of map commands the client wants. */
160 uint16 ACC (RW, look_position); /* start of drawing of look window */ 197 uint16 ACC (RW, look_position); /* start of drawing of look window */
… …
162 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 199 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
163 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */ 200 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */
164 201
165 maptile *ACC (RW, current_map); // CF+ last/current player map 202 maptile *ACC (RW, current_map); // CF+ last/current player map
166 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 203 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
167 char ACC (RW, version)[64]; // CF+ client name/version 204 char ACC (RW, version)[64]; // CF+ client name/version
168 205
169 // if we get an incomplete packet, this is used to hold the data.
170 // we add 2 byte for the header, one for the trailing 0 byte
171 uint8 inbuf[MAXSOCKBUF + 2 + 1];
172 player *ACC (RO, pl);//TODO should not be here, preferably 206 player *ACC (RO, pl);//TODO should not be here, preferably
173 207
174 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 208 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
175 209
176 client (int fd, const char *from_ip); 210 client (int fd, const char *from_ip);
… …
200 234
201 void send_packet (const char *buf); 235 void send_packet (const char *buf);
202 void send_packet (const char *buf, int len); 236 void send_packet (const char *buf, int len);
203 void send_packet_printf (const char *format, ...); 237 void send_packet_printf (const char *format, ...);
204 void send_packet (packet &sl); 238 void send_packet (packet &sl);
239
240 // called when something under the player changes
241 void floorbox_update () { update_look = 1; }
242 // called when the player has been moved
243 void floorbox_reset () { look_position = 0; floorbox_update (); }
244
245 // large structures at the end please
246 struct Map lastmap;
247 std::bitset<MAXANIMNUM> anims_sent;
248 // if we get an incomplete packet, this is used to hold the data.
249 // we add 2 byte for the header, one for the trailing 0 byte
250 uint8 inbuf[MAXSOCKBUF + 2 + 1];
205}; 251};
206 252
207#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 253#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
208 ( ((__type)>0) &&\ 254 ( ((__type)>0) &&\
209 ((__sockPtr)->has_readable_type) && \ 255 ((__sockPtr)->has_readable_type) && \

Diff Legend

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