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.41 by root, Fri Mar 16 02:37:54 2007 UTC vs.
Revision 1.46 by root, Tue Apr 10 09:35:23 2007 UTC

… …
66 66
67/* Only one map mode can actually be used, so lets make it a switch 67/* Only one map mode can actually be used, so lets make it a switch
68 * instead of having a bunch of different fields that needed to 68 * instead of having a bunch of different fields that needed to
69 * get toggled. 69 * get toggled.
70 */ 70 */
71enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 71enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
72 72
73/* The following is the setup for a ring buffer for storing output 73/* The following is the setup for a ring buffer for storing output
74 * data that the OS can't handle right away. 74 * data that the OS can't handle right away.
75 */ 75 */
76struct Buffer 76struct Buffer
… …
183 living ACC (RO, last_stats); /* Last stats as sent to client */ 183 living ACC (RO, last_stats); /* Last stats as sent to client */
184 float ACC (RW, last_speed); /* Last speed as sent to client */ 184 float ACC (RW, last_speed); /* Last speed as sent to client */
185 sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */ 185 sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */
186 sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */ 186 sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */
187 187
188 bool ACC (RW, force_face0); // client workaround for buggy checksum calculation in gcfclient
189 bool ACC (RW, force_bad_checksum); // client workaround for buggy checksum calculation in gcfclient
190 bool ACC (RW, force_image_newmap); // client workaround for client not redrawing map on image upload
191 bool ACC (RW, enable_bg_scrub); // client workaround, gcfclient becomes unusable if you send it images
192
188 bool ACC (RW, afk); /* player is afk */ 193 bool ACC (RW, afk); /* player is afk */
189 bool ACC (RW, facecache); /* If true, client is caching images */ 194 bool ACC (RW, facecache); /* If true, client is caching images */
190 bool ACC (RW, sent_scroll); 195 bool ACC (RW, sent_scroll);
191 bool ACC (RW, sound); /* does the client want sound */ 196 bool ACC (RW, sound); /* does the client want sound */
192 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ 197 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
193 bool ACC (RW, plugincmd); // extend the protocol through a plug-in */ 198 bool ACC (RW, plugincmd); // extend the protocol through a plug-in */
194 bool ACC (RW, mapinfocmd); // return map info and send map change info 199 bool ACC (RW, mapinfocmd); // return map info and send map change info
195 bool ACC (RW, extcmd); // call into extensions/plugins 200 bool ACC (RW, extcmd); // call into extensions/plugins
196 bool ACC (RW, extmap); // extend map comamnd with extra data 201 bool ACC (RW, extmap); // extend map comamnd with extra data
197 bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls 202 bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls
198 bool ACC (RW, force_face0); // client workaround for buggy checksum calculation in gcfclient
199 bool ACC (RW, force_bad_checksum); // client workaround for buggy checksum calculation in gcfclient
200 bool ACC (RW, force_image_newmap); // client workaround for client not redrawing map on image upload
201 bool ACC (RW, enable_bg_scrub); // client workaround, gcfclient becomes unusable if you send it images
202 bool ACC (RW, darkness); /* True if client wants darkness information */ 203 bool ACC (RW, darkness); /* True if client wants darkness information */
203 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 204 bool ACC (RW, image2); /* Client wants image2/face2 commands */
205 bool ACC (RW, fxix); // client implements fx and ix (face|image extended) commands
204 bool ACC (RW, update_look); /* If true, we need to send the look window */ 206 bool ACC (RW, update_look); /* If true, we need to send the look window */
205 bool ACC (RW, has_readable_type); /* If true client accept additional text information */ 207 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
206 /* used to arrange text in books, scrolls, or scripted dialogs */ 208 /* used to arrange text in books, scrolls, or scripted dialogs */
207 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */ 209 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */
208 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */ 210 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */
209 /* Below are flags for extedend infos to pass to client 211 /* Below are flags for extedend infos to pass to client
210 * with S->C mapextended command */ 212 * with S->C mapextended command */
211 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */ 213 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
214 bool ACC (RW, smoothing); // cfplus-style smoothing
212 215
213 bool ACC (RW, force_newmap); // force a newmap before next map update 216 bool ACC (RW, force_newmap); // force a newmap before next map update
214 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ 217 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
215 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 218 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
216 enum MapMode mapmode; /* Type of map commands the client wants. */
217 uint16 ACC (RW, look_position); /* start of drawing of look window */ 219 uint16 ACC (RW, look_position); /* start of drawing of look window */
220 uint16 ACC (RW, mss); // likely tcp maximum segment size
221 uint8 ACC (RW, mapmode); /* Type of map commands the client wants. */
218 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ 222 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */
219 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 223 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
220 224
221 maptile *ACC (RW, current_map); // CF+ last/current player map 225 maptile *ACC (RW, current_map); // CF+ last/current player map
222 region *ACC (RW, current_region); // CF+ last/current player region 226 region *ACC (RW, current_region); // CF+ last/current player region
… …
226 230
227 player_ptr ACC (RO, pl); 231 player_ptr ACC (RO, pl);
228 232
229 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 233 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
230 234
235 int ACC (RW, rate_avail); // current rate balance
231 int ACC (RW, max_rate); // max. # of bytes to send per tick 236 int ACC (RW, max_rate); // max. # of bytes to send per tick
232 faceidx ACC (RW, scrub_idx); // which face to send next 237 faceidx ACC (RW, scrub_idx); // which face to send next
233 int ACC (RW, bg_scrub); // how many ticks till the next background face send 238 int ACC (RW, bg_scrub); // how many ticks till the next background face send
239
240 faceidx partial_face;
241 uint32 partial_face_ofs; // if != 0, need to send remaining bytes of partial_face
234 std::vector<faceidx> askface; // which faces have been requested by the client 242 std::vector<faceidx, slice_allocator<faceidx> > askface; // which faces have been requested by the client
243
244 std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx
245 MTH void flush_fx (); // send fx if required
235 246
236 void do_destroy (); 247 void do_destroy ();
237 void gather_callbacks (AV *&callbacks, event_type event) const; 248 void gather_callbacks (AV *&callbacks, event_type event) const;
238 249
239 iow socket_ev; void socket_cb (iow &w, int got); 250 iow socket_ev; void socket_cb (iow &w, int got);

Diff Legend

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