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.7 by root, Sat Dec 16 21:40:26 2006 UTC vs.
Revision 1.10 by root, Tue Dec 19 05:12:52 2006 UTC

… …
88 int len; 88 int len;
89}; 89};
90 90
91// a handler for a specific type of packet 91// a handler for a specific type of packet
92enum { 92enum {
93 PF_PLAYER = 0x01, // must have valid player 93 PF_PLAYER = 0x01, // must have valid player / will by synchronised
94 PF_IMMEDIATE = 0x02, // TODO: hack, can be executed immediately
95 PF_PLAYING = 0x04, // must be in playing state 94 PF_PLAYING = 0x02, // must be in playing state
96}; 95};
97 96
98struct packet_type 97struct packet_type
99{ 98{
100 const char *name; 99 const char *name;
… …
109 char *data; 108 char *data;
110 int datalen; 109 int datalen;
111 110
112 ~command () 111 ~command ()
113 { 112 {
114 sfree (data, datalen); 113 sfree<char> (data, datalen + 1);
115 } 114 }
116}; 115};
117 116
118/* how many times we are allowed to give the wrong password before being kicked. */ 117/* how many times we are allowed to give the wrong password before being kicked. */
119#define MAX_PASSWORD_FAILURES 5 118#define MAX_PASSWORD_FAILURES 5
… …
121ACC_CLASS (client) // should become player when newsocket is a baseclass of player 120ACC_CLASS (client) // should become player when newsocket is a baseclass of player
122struct client : zero_initialised, attachable_base 121struct client : zero_initialised, attachable_base
123{ 122{
124 enum Sock_Status status; 123 enum Sock_Status status;
125 int ACC (RW, fd); 124 int ACC (RW, fd);
126 unsigned int inbuf_len; // number of bytes valid in inbuf 125 unsigned int inbuf_len; // number of bytes valid in inbuf
127 uint8 *faces_sent; // This is a bitmap on sent face status 126 uint8 *faces_sent; // This is a bitmap on sent face status
128 struct statsinfo stats; 127 struct statsinfo stats;
129 128
130 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 129 char *ACC (RW, host); /* Which host it is connected from (ip address) */
131 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ 130 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */
132 Buffer outputbuffer; 131 Buffer outputbuffer;
133 132
134 bool ACC (RW, facecache); /* If true, client is caching images */ 133 bool ACC (RW, facecache); /* If true, client is caching images */
135 bool ACC (RW, sent_scroll); 134 bool ACC (RW, sent_scroll);
136 bool ACC (RW, sound); /* does the client want sound */ 135 bool ACC (RW, sound); /* does the client want sound */
137 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */ 136 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */
138 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ 137 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
139 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */ 138 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */
140 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */ 139 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */
141 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 140 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */
142 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 141 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */
143 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */ 142 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */
144 bool ACC (RW, darkness); /* True if client wants darkness information */ 143 bool ACC (RW, darkness); /* True if client wants darkness information */
145 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 144 bool ACC (RW, image2); /* Client wants image2/face2 commands */
146 bool ACC (RW, update_look); /* If true, we need to send the look window */ 145 bool ACC (RW, update_look); /* If true, we need to send the look window */
147 bool ACC (RW, has_readable_type); /* If true client accept additional text information */ 146 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
148 /* used to arrange text in books, scrolls, or scripted dialogs */ 147 /* used to arrange text in books, scrolls, or scripted dialogs */
149 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */ 148 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */
150 bool ACC (RW, ext_mapinfos); /* If true client accept additionnal info on maps */ 149 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */
151 /* Below are flags for extedend infos to pass to client 150 /* Below are flags for extedend infos to pass to client
152 * with S->C mapextended command */ 151 * with S->C mapextended command */
153 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */ 152 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
154 153
155 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ 154 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
156 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 155 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
157 enum MapMode mapmode; /* Type of map commands the client wants. */ 156 enum MapMode mapmode; /* Type of map commands the client wants. */
158 uint16 ACC (RW, look_position); /* start of drawing of look window */ 157 uint16 ACC (RW, look_position); /* start of drawing of look window */
… …
160 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 159 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
161 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */ 160 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */
162 161
163 maptile *ACC (RW, current_map); // CF+ last/current player map 162 maptile *ACC (RW, current_map); // CF+ last/current player map
164 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 163 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
165 char ACC (RW, version)[64]; // CF+ client name/version 164 char ACC (RW, version)[64]; // CF+ client name/version
166 165
167 player *ACC (RO, pl);//TODO should not be here, preferably 166 player *ACC (RO, pl);//TODO should not be here, preferably
168 167
169 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 168 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
170 169
… …
195 194
196 void send_packet (const char *buf); 195 void send_packet (const char *buf);
197 void send_packet (const char *buf, int len); 196 void send_packet (const char *buf, int len);
198 void send_packet_printf (const char *format, ...); 197 void send_packet_printf (const char *format, ...);
199 void send_packet (packet &sl); 198 void send_packet (packet &sl);
199
200 // called when something under the player changes
201 void floorbox_update () { update_look = 1; }
202 // called when the player has been moved
203 void floorbox_reset () { look_position = 0; floorbox_update (); }
200 204
201 // large structures at the end please 205 // large structures at the end please
202 struct Map lastmap; 206 struct Map lastmap;
203 std::bitset<MAXANIMNUM> anims_sent; 207 std::bitset<MAXANIMNUM> anims_sent;
204 // if we get an incomplete packet, this is used to hold the data. 208 // if we get an incomplete packet, this is used to hold the data.
205 // we add 2 byte for the header, one for the trailing 0 byte 209 // we add 2 byte for the header, one for the trailing 0 byte
206 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 210 uint8 inbuf[MAXSOCKBUF + 2 + 1];
207
208}; 211};
209 212
210#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 213#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
211 ( ((__type)>0) &&\ 214 ( ((__type)>0) &&\
212 ((__sockPtr)->has_readable_type) && \ 215 ((__sockPtr)->has_readable_type) && \

Diff Legend

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