ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.26 by pippijn, Mon Dec 11 19:46:47 2006 UTC vs.
Revision 1.83 by root, Mon Apr 2 18:04:47 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client handling. 27 * Client handling.
27 * 28 *
… …
35 * have the prototype of (char *data, int datalen, int client_num). This 36 * have the prototype of (char *data, int datalen, int client_num). This
36 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
37 * 38 *
38 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
39 * 40 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 * esrv_map_doneredraw finishes the map update, and ships across the
47 * map updates.
48 *
49 */ 41 */
50 42
51#include <global.h> 43#include <global.h>
52#include <sproto.h> 44#include <sproto.h>
53 45
54#include <newclient.h>
55#include <newserver.h>
56#include <living.h> 46#include <living.h>
57#include <commands.h> 47#include <commands.h>
58 48
59/* This block is basically taken from socket.c - I assume if it works there, 49/* This block is basically taken from socket.c - I assume if it works there,
60 * it should work here. 50 * it should work here.
… …
63#include <sys/time.h> 53#include <sys/time.h>
64#include <sys/socket.h> 54#include <sys/socket.h>
65#include <netinet/in.h> 55#include <netinet/in.h>
66#include <netdb.h> 56#include <netdb.h>
67 57
68#ifdef HAVE_UNISTD_H
69# include <unistd.h> 58#include <unistd.h>
70#endif
71
72#ifdef HAVE_SYS_TIME_H
73# include <sys/time.h> 59#include <sys/time.h>
74#endif
75 60
76#include "sounds.h" 61#include "sounds.h"
77 62
78/** 63/**
79 * This table translates the attack numbers as used within the 64 * This table translates the attack numbers as used within the
… …
96 -1, /* life stealing */ 81 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 82 -1 /* Disease - not fully done yet */
98}; 83};
99 84
100static void 85static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 86socket_map_scroll (client *ns, int dx, int dy)
102{ 87{
103 struct Map newmap; 88 struct Map newmap;
104 int x, y, mx, my; 89 int x, y, mx, my;
105 90
106 {
107 char buf[MAXSOCKBUF];
108
109 sprintf (buf, "map_scroll %d %d", dx, dy); 91 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
110 Write_String_To_Socket (ns, buf, strlen (buf));
111 }
112 92
113 /* If we are using the Map1aCmd, we may in fact send 93 /* If we are using the Map1aCmd, we may in fact send
114 * head information that is outside the viewable map. 94 * head information that is outside the viewable map.
115 * So set the mx,my to the max value we want to 95 * So set the mx,my to the max value we want to
116 * look for. Removed code to do so - it caused extra 96 * look for. Removed code to do so - it caused extra
117 * complexities for the client, and probably doesn't make 97 * complexities for the client, and probably doesn't make
118 * that much difference in bandwidth. 98 * that much difference in bandwidth.
119 */ 99 */
120 mx = ns->mapx; 100 mx = ns->mapx;
121 my = ns->mapy; 101 my = ns->mapy;
122
123 if (ns->mapmode == Map1aCmd)
124 {
125 mx += MAX_HEAD_OFFSET;
126 my += MAX_HEAD_OFFSET;
127 }
128 102
129 /* the x and y here are coordinates for the new map, i.e. if we moved 103 /* the x and y here are coordinates for the new map, i.e. if we moved
130 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
131 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
132 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
… …
156} 130}
157 131
158static void 132static void
159clear_map (player *pl) 133clear_map (player *pl)
160{ 134{
161 NewSocket & socket = pl->socket;
162
163 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
164 136
137 pl->ns->force_newmap = false;
138
165 if (socket.newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
166 Write_String_To_Socket (&socket, "newmap", 6); 140 pl->ns->send_packet ("newmap");
167 141
168 socket.update_look = 1; 142 pl->ns->floorbox_reset ();
169 socket.look_position = 0;
170} 143}
171 144
172/** check for map change and send new map data */ 145/** check for map/region change and send new map data */
173static void 146static void
174check_map_change (player *pl) 147check_map_change (player *pl)
175{ 148{
176 NewSocket & socket = pl->socket; 149 client &socket = *pl->ns;
177 object *ob = pl->ob; 150 object *ob = pl->ob;
178 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
179 152
180 if (socket.current_map != ob->map) 153 if (socket.force_newmap)
181 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
182 socket.current_map = ob->map; 157 socket.current_map = ob->map;
183
184 clear_map (pl); 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
162 clear_map (pl);
163 socket.current_map = ob->map;
185 164
186 if (socket.mapinfocmd) 165 if (socket.mapinfocmd)
187 { 166 {
188 if (ob->map && ob->map->path[0]) 167 if (ob->map && ob->map->path[0])
189 { 168 {
… …
197 flags |= 4; 176 flags |= 4;
198 if (ob->map->tile_path[3]) 177 if (ob->map->tile_path[3])
199 flags |= 8; 178 flags |= 8;
200 179
201 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
202 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
203 } 182 }
204 else 183 else
205 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
206 185
207 Write_String_To_Socket (&socket, buf, strlen (buf)); 186 socket.send_packet (buf);
208 } 187 }
209 } 188 }
210 else if (socket.current_x != ob->x || socket.current_y != ob->y) 189 else if (socket.current_x != ob->x || socket.current_y != ob->y)
211 { 190 {
212 int dx = ob->x - socket.current_x; 191 int dx = ob->x - socket.current_x;
… …
215 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
216 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
217 else 196 else
218 { 197 {
219 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
220 socket.update_look = 1; 199 socket.floorbox_reset ();
221 socket.look_position = 0;
222 } 200 }
223 } 201 }
224 202
225 socket.current_x = ob->x; 203 socket.current_x = ob->x;
226 socket.current_y = ob->y; 204 socket.current_y = ob->y;
205
206 region *reg = ob->region ();
207 if (socket.current_region != reg)
208 {
209 socket.current_region = reg;
210 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
211 }
212}
213
214/**
215 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide
217 * that information.
218 */
219void
220RequestInfo (char *buf, int len, client * ns)
221{
222 char *params = NULL, *cp;
223
224 /* No match */
225 char bigbuf[MAX_BUF];
226 int slen;
227
228 /* Set up replyinfo before we modify any of the buffers - this is used
229 * if we don't find a match.
230 */
231 strcpy (bigbuf, "replyinfo ");
232 slen = strlen (bigbuf);
233 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234
235 /* find the first space, make it null, and update the
236 * params pointer.
237 */
238 for (cp = buf; *cp != '\0'; cp++)
239 if (*cp == ' ')
240 {
241 *cp = '\0';
242 params = cp + 1;
243 break;
244 }
245
246 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params);
248 else if (!strcmp (buf, "image_sums"))
249 send_image_sums (ns, params);
250 else if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params);
254 else
255 ns->send_packet (bigbuf, len);
227} 256}
228 257
229void 258void
230ExtCmd (char *buf, int len, player *pl) 259ExtCmd (char *buf, int len, player *pl)
231{ 260{
232 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 261 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
262}
263
264void
265ExtiCmd (char *buf, int len, client *ns)
266{
267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
233} 268}
234 269
235void 270void
236MapInfoCmd (char *buf, int len, player *pl) 271MapInfoCmd (char *buf, int len, player *pl)
237{ 272{
… …
252 buf += 8; 287 buf += 8;
253 288
254 // initial map and its origin 289 // initial map and its origin
255 maptile *map = pl->ob->map; 290 maptile *map = pl->ob->map;
256 sint16 dx, dy; 291 sint16 dx, dy;
257 int mapx = pl->socket.mapx / 2 - pl->ob->x; 292 int mapx = pl->ns->mapx / 2 - pl->ob->x;
258 int mapy = pl->socket.mapy / 2 - pl->ob->y; 293 int mapy = pl->ns->mapy / 2 - pl->ob->y;
259 int max_distance = 8; // limit maximum path length to something generous 294 int max_distance = 8; // limit maximum path length to something generous
260 295
261 while (*buf && map && max_distance) 296 while (*buf && map && max_distance)
262 { 297 {
263 int dir = *buf++; 298 int dir = *buf++;
264 299
265 switch (dir) 300 switch (dir)
266 { 301 {
267 case '1': 302 case '1':
268 dx = 0; 303 dx = 0;
269 dy = -1; 304 dy = -1;
270 map = get_map_from_coord (map, &dx, &dy); 305 map = map->xy_find (dx, dy);
271 map && (mapy -= map->height); 306 map && (mapy -= map->height);
272 break; 307 break;
273 case '2': 308 case '2':
274 mapx += map->width; 309 mapx += map->width;
275 dx = map->width; 310 dx = map->width;
276 dy = 0; 311 dy = 0;
277 map = get_map_from_coord (map, &dx, &dy); 312 map = map->xy_find (dx, dy);
278 break; 313 break;
279 case '3': 314 case '3':
280 mapy += map->height; 315 mapy += map->height;
281 dx = 0; 316 dx = 0;
282 dy = map->height; 317 dy = map->height;
283 map = get_map_from_coord (map, &dx, &dy); 318 map = map->xy_find (dx, dy);
284 break; 319 break;
285 case '4': 320 case '4':
286 dx = -1; 321 dx = -1;
287 dy = 0; 322 dy = 0;
288 map = get_map_from_coord (map, &dx, &dy); 323 map = map->xy_find (dx, dy);
289 map && (mapx -= map->width); 324 map && (mapx -= map->width);
290 break; 325 break;
291 } 326 }
292 327
293 --max_distance; 328 --max_distance;
294 } 329 }
295 330
… …
306 if (map->tile_path[2]) 341 if (map->tile_path[2])
307 flags |= 4; 342 flags |= 4;
308 if (map->tile_path[3]) 343 if (map->tile_path[3])
309 flags |= 8; 344 flags |= 8;
310 345
311 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
312 } 347 }
313 else 348 else
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 349 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
315 } 350 }
316 else 351 else
317 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
318 353
319 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 354 pl->ns->send_packet (bigbuf);
320} 355}
321 356
322/** This is the Setup cmd - easy first implementation */ 357/** This is the Setup cmd */
323void 358void
324SetUp (char *buf, int len, NewSocket * ns) 359SetUp (char *buf, int len, client * ns)
325{ 360{
326 int s, slen; 361 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
327 char *cmd, *param, cmdback[HUGE_BUF];
328
329 /* run through the cmds of setup
330 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
331 *
332 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
333 * The client then must sort this out
334 */
335
336 LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
337 strcpy (cmdback, "setup");
338 for (s = 0; s < len;)
339 {
340
341 cmd = &buf[s];
342
343 /* find the next space, and put a null there */
344 for (; buf[s] && buf[s] != ' '; s++);
345 buf[s++] = 0;
346 while (buf[s] == ' ')
347 s++;
348
349 if (s >= len)
350 break;
351
352 param = &buf[s];
353
354 for (; buf[s] && buf[s] != ' '; s++);
355 buf[s++] = 0;
356 while (buf[s] == ' ')
357 s++;
358
359 slen = strlen (cmdback);
360 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
361 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
362 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
363
364 if (!strcmp (cmd, "sound"))
365 {
366 ns->sound = atoi (param);
367 safe_strcat (cmdback, param, &slen, HUGE_BUF);
368 }
369 else if (!strcmp (cmd, "exp64"))
370 {
371 ns->exp64 = atoi (param);
372 safe_strcat (cmdback, param, &slen, HUGE_BUF);
373 }
374 else if (!strcmp (cmd, "spellmon"))
375 {
376 ns->monitor_spells = atoi (param);
377 safe_strcat (cmdback, param, &slen, HUGE_BUF);
378 }
379 else if (!strcmp (cmd, "darkness"))
380 {
381 ns->darkness = atoi (param);
382 safe_strcat (cmdback, param, &slen, HUGE_BUF);
383 }
384 else if (!strcmp (cmd, "map1cmd"))
385 {
386 if (atoi (param))
387 ns->mapmode = Map1Cmd;
388 /* if beyond this size, need to use map1cmd no matter what */
389 if (ns->mapx > 11 || ns->mapy > 11)
390 ns->mapmode = Map1Cmd;
391 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
392 }
393 else if (!strcmp (cmd, "map1acmd"))
394 {
395 if (atoi (param))
396 ns->mapmode = Map1aCmd;
397 /* if beyond this size, need to use map1acmd no matter what */
398 if (ns->mapx > 11 || ns->mapy > 11)
399 ns->mapmode = Map1aCmd;
400 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
401 }
402 else if (!strcmp (cmd, "newmapcmd"))
403 {
404 ns->newmapcmd = atoi (param);
405 safe_strcat (cmdback, param, &slen, HUGE_BUF);
406// } else if (!strcmp(cmd,"plugincmd")) {
407// ns->plugincmd = atoi(param);
408// safe_strcat(cmdback, param, &slen, HUGE_BUF);
409 }
410 else if (!strcmp (cmd, "mapinfocmd"))
411 {
412 ns->mapinfocmd = atoi (param);
413 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
414 }
415 else if (!strcmp (cmd, "extcmd"))
416 {
417 ns->extcmd = atoi (param);
418 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
419 }
420 else if (!strcmp (cmd, "extmap"))
421 {
422 ns->extmap = atoi (param);
423 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
424 }
425 else if (!strcmp (cmd, "facecache"))
426 {
427 ns->facecache = atoi (param);
428 safe_strcat (cmdback, param, &slen, HUGE_BUF);
429 }
430 else if (!strcmp (cmd, "faceset"))
431 {
432 char tmpbuf[20];
433 int q = atoi (param);
434
435 if (is_valid_faceset (q))
436 ns->faceset = q;
437 sprintf (tmpbuf, "%d", ns->faceset);
438 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
439 /* if the client is using faceset, it knows about image2 command */
440 ns->image2 = 1;
441 }
442 else if (!strcmp (cmd, "itemcmd"))
443 {
444 /* Version of the item protocol command to use. Currently,
445 * only supported versions are 1 and 2. Using a numeric
446 * value will make it very easy to extend this in the future.
447 */
448 char tmpbuf[20];
449 int q = atoi (param);
450
451 if (q < 1 || q > 2)
452 {
453 strcpy (tmpbuf, "FALSE");
454 }
455 else
456 {
457 ns->itemcmd = q;
458 sprintf (tmpbuf, "%d", ns->itemcmd);
459 }
460 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
461 }
462 else if (!strcmp (cmd, "mapsize"))
463 {
464 int x, y = 0;
465 char tmpbuf[MAX_BUF], *cp;
466
467 x = atoi (param);
468 for (cp = param; *cp != 0; cp++)
469 if (*cp == 'x' || *cp == 'X')
470 {
471 y = atoi (cp + 1);
472 break;
473 }
474 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
475 {
476 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
477 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
478 }
479 else
480 {
481 ns->mapx = x;
482 ns->mapy = y;
483 /* better to send back what we are really using and not the
484 * param as given to us in case it gets parsed differently.
485 */
486 sprintf (tmpbuf, "%dx%d", x, y);
487 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488 /* If beyond this size and still using orig map command, need to
489 * go to map1cmd.
490 */
491 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
492 ns->mapmode = Map1Cmd;
493 }
494 }
495 else if (!strcmp (cmd, "extendedMapInfos"))
496 {
497 /* Added by tchize
498 * prepare to use the mapextended command
499 */
500 char tmpbuf[20];
501
502 ns->ext_mapinfos = (atoi (param));
503 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
504 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
505 }
506 else if (!strcmp (cmd, "extendedTextInfos"))
507 {
508 /* Added by tchize
509 * prepare to use the extended text commands
510 * Client toggle this to non zero to get exttext
511 */
512 char tmpbuf[20];
513
514 ns->has_readable_type = (atoi (param));
515 sprintf (tmpbuf, "%d", ns->has_readable_type);
516 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
517 }
518 else
519 {
520 /* Didn't get a setup command we understood -
521 * report a failure to the client.
522 */
523 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
524 }
525 } /* for processing all the setup commands */
526 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
527 Write_String_To_Socket (ns, cmdback, strlen (cmdback));
528} 362}
529 363
530/** 364/**
531 * The client has requested to be added to the game. 365 * The client has requested to be added to the game.
532 * This is what takes care of it. We tell the client how things worked out. 366 * This is what takes care of it. We tell the client how things worked out.
533 * I am not sure if this file is the best place for this function. however, 367 * I am not sure if this file is the best place for this function. however,
534 * it either has to be here or init_sockets needs to be exported. 368 * it either has to be here or init_sockets needs to be exported.
535 */ 369 */
536void 370void
537AddMeCmd (char *buf, int len, NewSocket * ns) 371AddMeCmd (char *buf, int len, client *ns)
538{ 372{
539 Settings oldsettings; 373 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
540
541 oldsettings = settings;
542 if (ns->status != Ns_Add || add_player (ns))
543 {
544 Write_String_To_Socket (ns, "addme_failed", 12);
545 }
546 else
547 {
548 /* Basically, the add_player copies the socket structure into
549 * the player structure, so this one (which is from init_sockets)
550 * is not needed anymore. The write below should still work, as the
551 * stuff in ns is still relevant.
552 */
553 Write_String_To_Socket (ns, "addme_success", 13);
554 socket_info.nconns--;
555 ns->status = Ns_Avail;
556 }
557 settings = oldsettings;
558} 374}
559 375
560/** Reply to ExtendedInfos command */ 376/** Reply to ExtendedInfos command */
561void 377void
562ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 378ToggleExtendedInfos (char *buf, int len, client * ns)
563{ 379{
564 char cmdback[MAX_BUF]; 380 char cmdback[MAX_BUF];
565 char command[50]; 381 char command[50];
566 int info, nextinfo; 382 int info, nextinfo;
567 383
… …
605 { 421 {
606 strcat (cmdback, " "); 422 strcat (cmdback, " ");
607 strcat (cmdback, "smoothing"); 423 strcat (cmdback, "smoothing");
608 } 424 }
609 425
610 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 426 ns->send_packet (cmdback);
611} 427}
612 428
613/* 429/*
614#define MSG_TYPE_BOOK 1 430#define MSG_TYPE_BOOK 1
615#define MSG_TYPE_CARD 2 431#define MSG_TYPE_CARD 2
… …
618#define MSG_TYPE_MONUMENT 5 434#define MSG_TYPE_MONUMENT 5
619#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 435#define MSG_TYPE_SCRIPTED_DIALOG 6*/
620 436
621/** Reply to ExtendedInfos command */ 437/** Reply to ExtendedInfos command */
622void 438void
623ToggleExtendedText (char *buf, int len, NewSocket * ns) 439ToggleExtendedText (char *buf, int len, client * ns)
624{ 440{
625 char cmdback[MAX_BUF]; 441 char cmdback[MAX_BUF];
626 char temp[10]; 442 char temp[10];
627 char command[50]; 443 char command[50];
628 int info, nextinfo, i, flag; 444 int info, nextinfo, i, flag;
… …
668 strcat (cmdback, " "); 484 strcat (cmdback, " ");
669 snprintf (temp, sizeof (temp), "%d", i); 485 snprintf (temp, sizeof (temp), "%d", i);
670 strcat (cmdback, temp); 486 strcat (cmdback, temp);
671 } 487 }
672 488
673 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 489 ns->send_packet (cmdback);
674} 490}
675 491
676/**
677 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
678 * Basically, it makes no sense to wait for the client to request a
679 * a piece of data from us that we know the client wants. So
680 * if we know the client wants it, might as well push it to the
681 * client.
682 */
683static void
684SendSmooth (NewSocket * ns, uint16 face)
685{
686 uint16 smoothface;
687 unsigned char reply[MAX_BUF];
688 SockList sl;
689
690 /* If we can't find a face, return and set it so we won't try to send this
691 * again.
692 */
693 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
694 {
695
696 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
697 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
698 return;
699 }
700
701 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
702 esrv_send_face (ns, smoothface, 0);
703
704 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
705
706 sl.buf = reply;
707 strcpy ((char *) sl.buf, "smooth ");
708 sl.len = strlen ((char *) sl.buf);
709 SockList_AddShort (&sl, face);
710 SockList_AddShort (&sl, smoothface);
711 Send_With_Handling (ns, &sl);
712}
713
714 /** 492/**
493 * client requested an image. send it rate-limited
494 * before flushing.
495 */
496void
497AskFaceCmd (char *buf, int len, client *ns)
498{
499 ns->askface.push_back (atoi (buf));
500}
501
502/**
715 * Tells client the picture it has to use 503 * Tells client the picture it has to use
716 * to smooth a picture number given as argument. 504 * to smooth a picture number given as argument.
717 */ 505 */
718void 506void
719AskSmooth (char *buf, int len, NewSocket * ns) 507AskSmooth (char *buf, int len, client *ns)
720{ 508{
721 uint16 facenbr; 509 ns->send_face (atoi (buf));
722
723 facenbr = atoi (buf);
724 SendSmooth (ns, facenbr);
725} 510}
726
727
728
729
730 511
731/** 512/**
732 * This handles the general commands from the client (ie, north, fire, cast, 513 * This handles the general commands from the client (ie, north, fire, cast,
733 * etc.) 514 * etc.)
734 */ 515 */
735void 516void
736PlayerCmd (char *buf, int len, player *pl) 517PlayerCmd (char *buf, int len, player *pl)
737{ 518{
738
739 /* The following should never happen with a proper or honest client.
740 * Therefore, the error message doesn't have to be too clear - if
741 * someone is playing with a hacked/non working client, this gives them
742 * an idea of the problem, but they deserve what they get
743 */
744 if (pl->state != ST_PLAYING)
745 {
746 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
747 return;
748 }
749 /* Check if there is a count. In theory, a zero count could also be 519 /* Check if there is a count. In theory, a zero count could also be
750 * sent, so check for that also. 520 * sent, so check for that also.
751 */ 521 */
752 if (atoi (buf) || buf[0] == '0') 522 if (atoi (buf) || buf[0] == '0')
753 { 523 {
754 pl->count = atoi ((char *) buf); 524 pl->count = atoi ((char *) buf);
525
755 buf = strchr (buf, ' '); /* advance beyond the numbers */ 526 buf = strchr (buf, ' '); /* advance beyond the numbers */
756 if (!buf) 527 if (!buf)
757 {
758#ifdef ESRV_DEBUG
759 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
760#endif
761 return; 528 return;
762 } 529
763 buf++; 530 buf++;
764 } 531 }
765 /* This should not happen anymore. */ 532
766 if (pl->ob->speed_left < -1.0)
767 {
768 LOG (llevError, "Player has negative time - shouldn't do command.\n");
769 }
770 /* In c_new.c */
771 execute_newserver_command (pl->ob, (char *) buf); 533 execute_newserver_command (pl->ob, (char *) buf);
772 /* Perhaps something better should be done with a left over count.
773 * Cleaning up the input should probably be done first - all actions
774 * for the command that issued the count should be done before any other
775 * commands.
776 */
777 534
778 pl->count = 0;
779
780}
781
782
783/**
784 * This handles the general commands from the client (ie, north, fire, cast,
785 * etc.). It is a lot like PlayerCmd above, but is called with the
786 * 'ncom' method which gives more information back to the client so it
787 * can throttle.
788 */
789void
790NewPlayerCmd (uint8 * buf, int len, player *pl)
791{
792 int time, repeat;
793 short packet;
794 unsigned char command[MAX_BUF];
795 SockList sl;
796
797 if (len < 7)
798 {
799 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
800 return;
801 }
802
803 packet = GetShort_String (buf);
804 repeat = GetInt_String (buf + 2);
805 /* -1 is special - no repeat, but don't update */
806 if (repeat != -1)
807 {
808 pl->count = repeat;
809 }
810 if ((len - 4) >= MAX_BUF)
811 len = MAX_BUF - 5;
812
813 strncpy ((char *) command, (char *) buf + 6, len - 4);
814 command[len - 4] = '\0';
815
816 /* The following should never happen with a proper or honest client.
817 * Therefore, the error message doesn't have to be too clear - if
818 * someone is playing with a hacked/non working client, this gives them
819 * an idea of the problem, but they deserve what they get
820 */
821 if (pl->state != ST_PLAYING)
822 {
823 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
824 return;
825 }
826
827 /* This should not happen anymore. */
828 if (pl->ob->speed_left < -1.0)
829 {
830 LOG (llevError, "Player has negative time - shouldn't do command.\n");
831 }
832 /* In c_new.c */
833 execute_newserver_command (pl->ob, (char *) command);
834 /* Perhaps something better should be done with a left over count. 535 /* Perhaps something better should be done with a left over count.
835 * Cleaning up the input should probably be done first - all actions 536 * Cleaning up the input should probably be done first - all actions
836 * for the command that issued the count should be done before any other 537 * for the command that issued the count should be done before any other
837 * commands. 538 * commands.
838 */ 539 */
839 pl->count = 0; 540 pl->count = 0;
541}
542
543
544/**
545 * This handles the general commands from the client (ie, north, fire, cast,
546 * etc.). It is a lot like PlayerCmd above, but is called with the
547 * 'ncom' method which gives more information back to the client so it
548 * can throttle.
549 */
550void
551NewPlayerCmd (char *buf, int len, player *pl)
552{
553 if (len <= 6)
554 {
555 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
556 return;
557 }
558
559 uint16 cmdid = net_uint16 ((uint8 *)buf);
560 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
561
562 /* -1 is special - no repeat, but don't update */
563 if (repeat != -1)
564 pl->count = repeat;
565
566 buf += 6; //len -= 6;
567
568 execute_newserver_command (pl->ob, buf);
569
570 /* Perhaps something better should be done with a left over count.
571 * Cleaning up the input should probably be done first - all actions
572 * for the command that issued the count should be done before any other
573 * commands.
574 */
575 pl->count = 0;
576
577 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
578 int time = fabs (pl->ob->speed) < 0.001
579 ? time = MAX_TIME * 100
580 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
840 581
841 /* Send confirmation of command execution now */ 582 /* Send confirmation of command execution now */
842 sl.buf = command; 583 packet sl ("comc");
843 strcpy ((char *) sl.buf, "comc "); 584 sl << uint16 (cmdid) << uint32 (time);
844 sl.len = 5; 585 pl->ns->send_packet (sl);
845 SockList_AddShort (&sl, packet);
846 if (FABS (pl->ob->speed) < 0.001)
847 time = MAX_TIME * 100;
848 else
849 time = (int) (MAX_TIME / FABS (pl->ob->speed));
850 SockList_AddInt (&sl, time);
851 Send_With_Handling (&pl->socket, &sl);
852} 586}
853
854 587
855/** This is a reply to a previous query. */ 588/** This is a reply to a previous query. */
856void 589void
857ReplyCmd (char *buf, int len, player *pl) 590ReplyCmd (char *buf, int len, client *ns)
858{ 591{
592 if (ns->state == ST_CUSTOM)
593 {
594 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
595 return;
596 }
597
598 if (!ns->pl)
599 return; //TODO: depends on the exact reply we are after
600 //TODO: but right now, we always have a ns->pl
601
602 player *pl = ns->pl;
603
859 /* This is to synthesize how the data would be stored if it 604 /* This is to synthesize how the data would be stored if it
860 * was normally entered. A bit of a hack, and should be cleaned up 605 * was normally entered. A bit of a hack, and should be cleaned up
861 * once all the X11 code is removed from the server. 606 * once all the X11 code is removed from the server.
862 * 607 *
863 * We pass 13 to many of the functions because this way they 608 * We pass 13 to many of the functions because this way they
864 * think it was the carriage return that was entered, and the 609 * think it was the carriage return that was entered, and the
865 * function then does not try to do additional input. 610 * function then does not try to do additional input.
866 */ 611 */
867 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 612 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
868 613
869 /* this avoids any hacking here */ 614 /* this avoids any hacking here */
870 615
871 switch (pl->state) 616 switch (ns->state)
872 { 617 {
873 case ST_PLAYING: 618 case ST_PLAYING:
874 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 619 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
875 break; 620 break;
876 621
877 case ST_PLAY_AGAIN:
878 /* We can check this for return value (2==quit). Maybe we
879 * should, and do something appropriate?
880 */
881 receive_play_again (pl->ob, buf[0]);
882 break;
883
884 case ST_ROLL_STAT:
885 key_roll_stat (pl->ob, buf[0]);
886 break;
887
888 case ST_CHANGE_CLASS: 622 case ST_CHANGE_CLASS:
889
890 key_change_class (pl->ob, buf[0]); 623 key_change_class (pl->ob, buf[0]);
891 break; 624 break;
892 625
893 case ST_CONFIRM_QUIT:
894 key_confirm_quit (pl->ob, buf[0]);
895 break;
896
897 case ST_CONFIGURE:
898 LOG (llevError, "In client input handling, but into configure state\n");
899 pl->state = ST_PLAYING;
900 break;
901
902 case ST_GET_NAME:
903 receive_player_name (pl->ob, 13);
904 break;
905
906 case ST_GET_PASSWORD:
907 case ST_CONFIRM_PASSWORD:
908 receive_player_password (pl->ob, 13);
909 break;
910
911 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 626 case ST_GET_PARTY_PASSWORD: /* Get password for party */
912 receive_party_password (pl->ob, 13); 627 receive_party_password (pl->ob, 13);
913 break; 628 break;
914 629
915 default: 630 default:
916 LOG (llevError, "Unknown input state: %d\n", pl->state); 631 LOG (llevError, "Unknown input state: %d\n", ns->state);
917 } 632 }
918} 633}
919 634
920/** 635/**
921 * Client tells its version. If there is a mismatch, we close the 636 * Client tells its version. If there is a mismatch, we close the
… …
923 * something older than the server. If we assume the client will be 638 * something older than the server. If we assume the client will be
924 * backwards compatible, having it be a later version should not be a 639 * backwards compatible, having it be a later version should not be a
925 * problem. 640 * problem.
926 */ 641 */
927void 642void
928VersionCmd (char *buf, int len, NewSocket * ns) 643VersionCmd (char *buf, int len, client * ns)
929{ 644{
930 char *cp;
931 char version_warning[256];
932
933 if (!buf) 645 if (!buf)
934 { 646 {
935 LOG (llevError, "CS: received corrupted version command\n"); 647 LOG (llevError, "CS: received corrupted version command\n");
936 return; 648 return;
937 } 649 }
938 650
939 ns->cs_version = atoi (buf); 651 ns->cs_version = atoi (buf);
940 ns->sc_version = ns->cs_version; 652 ns->sc_version = ns->cs_version;
653
654 LOG (llevDebug, "connection from client <%s>\n", buf);
655
656 //TODO: should log here just for statistics
657
941 if (VERSION_CS != ns->cs_version) 658 //if (VERSION_CS != ns->cs_version)
942 { 659 // unchecked;
943#ifdef ESRV_DEBUG 660
944 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
945#endif
946 }
947 cp = strchr (buf + 1, ' '); 661 char *cp = strchr (buf + 1, ' ');
948 if (!cp) 662 if (!cp)
949 return; 663 return;
664
950 ns->sc_version = atoi (cp); 665 ns->sc_version = atoi (cp);
666
951 if (VERSION_SC != ns->sc_version) 667 //if (VERSION_SC != ns->sc_version)
952 { 668 // unchecked;
953#ifdef ESRV_DEBUG 669
954 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
955#endif
956 }
957 cp = strchr (cp + 1, ' '); 670 cp = strchr (cp + 1, ' ');
671
958 if (cp) 672 if (cp)
959 { 673 {
960 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 674 assign (ns->version, cp + 1);
961 675
962 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 676 if (ns->sc_version < 1026)
963 677 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
964 /* This is first implementation - i skip all beta DX clients with it
965 * Add later stuff here for other clients
966 */
967
968 /* these are old dxclients */
969 /* Version 1024 added support for singular + plural name values -
970 * requiing this minimal value reduces complexity of that code, and it
971 * has been around for a long time.
972 */
973 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024)
974 {
975 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
976 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 678 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
977 Write_String_To_Socket (ns, version_warning, strlen (version_warning));
978 }
979
980 } 679 }
981} 680}
982 681
983/** sound related functions. */ 682/** sound related functions. */
984
985void 683void
986SetSound (char *buf, int len, NewSocket * ns) 684SetSound (char *buf, int len, client * ns)
987{ 685{
988 ns->sound = atoi (buf); 686 ns->sound = atoi (buf);
989} 687}
990 688
991/** client wants the map resent */ 689/** client wants the map resent */
992
993void 690void
994MapRedrawCmd (char *buf, int len, player *pl) 691MapRedrawCmd (char *buf, int len, player *pl)
995{ 692{
996
997/* This function is currently disabled; just clearing the map state results in 693/* This function is currently disabled; just clearing the map state results in
998 * display errors. It should clear the cache and send a newmap command. 694 * display errors. It should clear the cache and send a newmap command.
999 * Unfortunately this solution does not work because some client versions send 695 * Unfortunately this solution does not work because some client versions send
1000 * a mapredraw command after receiving a newmap command. 696 * a mapredraw command after receiving a newmap command.
1001 */ 697 */
1002#if 0
1003 /* Okay, this is MAJOR UGLY. but the only way I know how to
1004 * clear the "cache"
1005 */
1006 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1007 draw_client_map (pl->ob);
1008#endif
1009} 698}
1010 699
1011/** 700/**
1012 * Moves an object (typically, container to inventory). 701 * Moves an object (typically, container to inventory).
1013 * syntax is: move (to) (tag) (nrof) 702 * syntax is: move (to) (tag) (nrof)
… …
1016MoveCmd (char *buf, int len, player *pl) 705MoveCmd (char *buf, int len, player *pl)
1017{ 706{
1018 int vals[3], i; 707 int vals[3], i;
1019 708
1020 /* A little funky here. We only cycle for 2 records, because 709 /* A little funky here. We only cycle for 2 records, because
1021 * we obviously am not going to find a space after the third 710 * we obviously are not going to find a space after the third
1022 * record. Perhaps we should just replace this with a 711 * record. Perhaps we should just replace this with a
1023 * sscanf? 712 * sscanf?
1024 */ 713 */
1025 for (i = 0; i < 2; i++) 714 for (i = 0; i < 2; i++)
1026 { 715 {
1027 vals[i] = atoi (buf); 716 vals[i] = atoi (buf);
717
1028 if (!(buf = strchr (buf, ' '))) 718 if (!(buf = strchr (buf, ' ')))
1029 { 719 {
1030 LOG (llevError, "Incomplete move command: %s\n", buf); 720 LOG (llevError, "Incomplete move command: %s\n", buf);
1031 return; 721 return;
1032 } 722 }
723
1033 buf++; 724 buf++;
1034 } 725 }
726
1035 vals[2] = atoi (buf); 727 vals[2] = atoi (buf);
1036 728
1037/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 729/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1038 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 730 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1039} 731}
1040
1041
1042 732
1043/****************************************************************************** 733/******************************************************************************
1044 * 734 *
1045 * Start of commands the server sends to the client. 735 * Start of commands the server sends to the client.
1046 * 736 *
… …
1049/** 739/**
1050 * Asks the client to query the user. This way, the client knows 740 * Asks the client to query the user. This way, the client knows
1051 * it needs to send something back (vs just printing out a message) 741 * it needs to send something back (vs just printing out a message)
1052 */ 742 */
1053void 743void
1054send_query (NewSocket * ns, uint8 flags, char *text) 744send_query (client *ns, uint8 flags, const char *text)
1055{ 745{
1056 char buf[MAX_BUF];
1057
1058 sprintf (buf, "query %d %s", flags, text ? text : ""); 746 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1059 Write_String_To_Socket (ns, buf, strlen (buf));
1060} 747}
1061 748
1062#define AddIfInt64(Old,New,Type) if (Old != New) {\ 749#define AddIfInt64(Old,New,Type) if (Old != New) {\
1063 Old = New; \ 750 Old = New; \
1064 SockList_AddChar(&sl, Type); \ 751 sl << uint8 (Type) << uint64 (New); \
1065 SockList_AddInt64(&sl, New); \
1066 } 752 }
1067 753
1068#define AddIfInt(Old,New,Type) if (Old != New) {\ 754#define AddIfInt(Old,New,Type) if (Old != New) {\
1069 Old = New; \ 755 Old = New; \
1070 SockList_AddChar(&sl, Type); \ 756 sl << uint8 (Type) << uint32 (New); \
1071 SockList_AddInt(&sl, New); \
1072 } 757 }
1073 758
1074#define AddIfShort(Old,New,Type) if (Old != New) {\ 759#define AddIfShort(Old,New,Type) if (Old != New) {\
1075 Old = New; \ 760 Old = New; \
1076 SockList_AddChar(&sl, Type); \ 761 sl << uint8 (Type) << uint16 (New); \
1077 SockList_AddShort(&sl, New); \
1078 } 762 }
1079 763
1080#define AddIfFloat(Old,New,Type) if (Old != New) {\ 764#define AddIfFloat(Old,New,Type) if (Old != New) {\
1081 Old = New; \ 765 Old = New; \
1082 SockList_AddChar(&sl, Type); \ 766 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1083 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1084 } 767 }
1085 768
1086#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 769#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1087 if (Old) free(Old);\
1088 Old = strdup_local(New);\ 770 free(Old); Old = strdup (New);\
1089 SockList_AddChar(&sl, Type); \ 771 sl << uint8 (Type) << data8 (New); \
1090 SockList_AddChar(&sl, ( char )strlen(New)); \
1091 strcpy((char*)sl.buf + sl.len, New); \
1092 sl.len += strlen(New); \
1093 } 772 }
1094 773
1095/** 774/**
1096 * Sends a statistics update. We look at the old values, 775 * Sends a statistics update. We look at the old values,
1097 * and only send what has changed. Stat mapping values are in newclient.h 776 * and only send what has changed. Stat mapping values are in newclient.h
… …
1099 * commands for now. 778 * commands for now.
1100 */ 779 */
1101void 780void
1102esrv_update_stats (player *pl) 781esrv_update_stats (player *pl)
1103{ 782{
1104 SockList sl;
1105 char buf[MAX_BUF]; 783 char buf[MAX_BUF];
1106 uint16 flags; 784 uint16 flags;
1107 785
1108 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 786 client *ns = pl->ns;
1109 strcpy ((char *) sl.buf, "stats "); 787 if (!ns)
1110 sl.len = strlen ((char *) sl.buf); 788 return;
1111 789
1112 if (pl->ob != NULL) 790 object *ob = pl->ob;
1113 { 791 if (!ob)
792 return;
793
794 packet sl ("stats");
795
1114 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 796 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1115 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 797 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1116 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 798 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1117 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 799 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1118 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 800 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1119 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 801 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1120 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 802 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1121 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1122 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1123 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1124 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 803 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1125 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 804 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
805 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
806 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
807 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1126 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 808 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1127 }
1128 809
1129 if (pl->socket.exp64)
1130 {
1131 uint8 s;
1132
1133 for (s = 0; s < NUM_SKILLS; s++) 810 for (int s = 0; s < NUM_SKILLS; s++)
811 if (object *skill = pl->last_skill_ob[s])
812 if (skill->stats.exp != ns->last_skill_exp [s])
1134 { 813 {
1135 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 814 ns->last_skill_exp [s] = skill->stats.exp;
1136 {
1137 815
1138 /* Always send along the level if exp changes. This is only 816 /* Always send along the level if exp changes. This is only
1139 * 1 extra byte, but keeps processing simpler. 817 * 1 extra byte, but keeps processing simpler.
1140 */ 818 */
1141 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 819 sl << uint8 (s + CS_STAT_SKILLINFO)
1142 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 820 << uint8 (skill->level)
1143 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 821 << uint64 (skill->stats.exp);
1144 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1145 }
1146 } 822 }
1147 }
1148 823
1149 if (pl->socket.exp64)
1150 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 824 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1151 else
1152 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1153
1154 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 825 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1155 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 826 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1156 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 827 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1157 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 828 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1158 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 829 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1159 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 830 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1160 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 831 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1161 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 832 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
833
1162 flags = 0; 834 flags = 0;
1163 835
1164 if (pl->fire_on) 836 if (pl->fire_on)
1165 flags |= SF_FIREON; 837 flags |= SF_FIREON;
1166 838
1167 if (pl->run_on) 839 if (pl->run_on)
1168 flags |= SF_RUNON; 840 flags |= SF_RUNON;
1169 841
1170 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 842 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1171 843
1172 if (pl->socket.sc_version < 1025) 844 if (ns->sc_version < 1025)
1173 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 845 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1174 else 846 else
1175 {
1176 int i;
1177
1178 for (i = 0; i < NROFATTACKS; i++) 847 for (int i = 0; i < NROFATTACKS; i++)
1179 { 848 {
1180 /* Skip ones we won't send */ 849 /* Skip ones we won't send */
1181 if (atnr_cs_stat[i] == -1) 850 if (atnr_cs_stat[i] == -1)
1182 continue; 851 continue;
1183 852
1184 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 853 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1185 } 854 }
1186 }
1187 855
1188 if (pl->socket.monitor_spells) 856 if (pl->ns->monitor_spells)
1189 { 857 {
1190 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 858 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1191 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 859 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1192 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 860 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1193 } 861 }
1194 862
1195 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 863 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1196 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 864 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1197 set_title (pl->ob, buf); 865 set_title (ob, buf);
1198 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 866 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1199 867
1200 /* Only send it away if we have some actual data */ 868 /* Only send it away if we have some actual data */
1201 if (sl.len > 6) 869 if (sl.length () > 6)
1202 { 870 ns->send_packet (sl);
1203#ifdef ESRV_DEBUG
1204 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1205#endif
1206 Send_With_Handling (&pl->socket, &sl);
1207 }
1208
1209 free (sl.buf);
1210} 871}
1211 872
1212/** 873/**
1213 * Tells the client that here is a player it should start using. 874 * Tells the client that here is a player it should start using.
1214 */ 875 */
1215void 876void
1216esrv_new_player (player *pl, uint32 weight) 877esrv_new_player (player *pl, uint32 weight)
1217{ 878{
1218 SockList sl; 879 packet sl ("player");
1219 880
881 sl << uint32 (pl->ob->count)
882 << uint32 (weight)
883 << uint32 (pl->ob->face)
884 << data8 (pl->ob->name);
885
1220 pl->last_weight = weight; 886 pl->ns->last_weight = weight;
1221 887 pl->ns->send_packet (sl);
1222 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1223
1224 strcpy ((char *) sl.buf, "player ");
1225 sl.len = strlen ((char *) sl.buf);
1226 SockList_AddInt (&sl, pl->ob->count);
1227 SockList_AddInt (&sl, weight);
1228 SockList_AddInt (&sl, pl->ob->face->number);
1229
1230 SockList_AddChar (&sl, (char) strlen (pl->ob->name));
1231 strcpy ((char *) sl.buf + sl.len, pl->ob->name);
1232 sl.len += strlen (pl->ob->name);
1233
1234 Send_With_Handling (&pl->socket, &sl);
1235 free (sl.buf);
1236 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 888 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1237} 889}
1238
1239/**
1240 * Need to send an animation sequence to the client.
1241 * We will send appropriate face commands to the client if we haven't
1242 * sent them the face yet (this can become quite costly in terms of
1243 * how much we are sending - on the other hand, this should only happen
1244 * when the player logs in and picks stuff up.
1245 */
1246void
1247esrv_send_animation (NewSocket * ns, short anim_num)
1248{
1249 SockList sl;
1250 int i;
1251
1252 /* Do some checking on the anim_num we got. Note that the animations
1253 * are added in contigous order, so if the number is in the valid
1254 * range, it must be a valid animation.
1255 */
1256 if (anim_num < 0 || anim_num > num_animations)
1257 {
1258 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1259 return;
1260 }
1261
1262 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1263 strcpy ((char *) sl.buf, "anim ");
1264 sl.len = 5;
1265 SockList_AddShort (&sl, anim_num);
1266 SockList_AddShort (&sl, 0); /* flags - not used right now */
1267 /* Build up the list of faces. Also, send any information (ie, the
1268 * the face itself) down to the client.
1269 */
1270 for (i = 0; i < animations[anim_num].num_animations; i++)
1271 {
1272 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1273 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1274 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */
1275 }
1276 Send_With_Handling (ns, &sl);
1277 free (sl.buf);
1278 ns->anims_sent[anim_num] = 1;
1279}
1280
1281 890
1282/****************************************************************************** 891/******************************************************************************
1283 * 892 *
1284 * Start of map related commands. 893 * Start of map related commands.
1285 * 894 *
1286 ******************************************************************************/ 895 ******************************************************************************/
1287 896
1288/**
1289 * This adds face_num to a map cell at x,y. If the client doesn't have
1290 * the face yet, we will also send it.
1291 */
1292static void
1293esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap)
1294{
1295 if (newmap->cells[x][y].count >= MAP_LAYERS)
1296 {
1297 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1298 return;
1299 abort ();
1300 }
1301 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1302 newmap->cells[x][y].count++;
1303 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1304 esrv_send_face (ns, face_num, 0);
1305}
1306
1307struct LayerCell
1308{
1309 uint16 xy;
1310 short face;
1311};
1312
1313struct MapLayer
1314{
1315 int count;
1316 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1317};
1318
1319/** Checkes if map cells have changed */
1320static int
1321mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1322{
1323 int k;
1324
1325 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1326 return 1;
1327 for (k = 0; k < newmap->cells[i][j].count; k++)
1328 {
1329 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1330 {
1331 return 1;
1332 }
1333 }
1334 return 0;
1335}
1336
1337/**
1338 * Basically, what this does is pack the data into layers.
1339 * cnum is the client number, cur is the the buffer we put all of
1340 * this data into. we return the end of the data. layers is
1341 * how many layers of data we should back.
1342 */
1343static uint8 *
1344compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1345{
1346 int x, y, k;
1347 int face;
1348 unsigned char *fcur;
1349 struct MapLayer layers[MAP_LAYERS];
1350
1351 for (k = 0; k < MAP_LAYERS; k++)
1352 layers[k].count = 0;
1353 fcur = cur;
1354 for (x = 0; x < ns->mapx; x++)
1355 {
1356 for (y = 0; y < ns->mapy; y++)
1357 {
1358 if (!mapcellchanged (ns, x, y, newmap))
1359 continue;
1360 if (newmap->cells[x][y].count == 0)
1361 {
1362 *cur = x * ns->mapy + y; /* mark empty space */
1363 cur++;
1364 continue;
1365 }
1366 for (k = 0; k < newmap->cells[x][y].count; k++)
1367 {
1368 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1369 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1370 layers[k].count++;
1371 }
1372 }
1373 }
1374 /* If no data, return now. */
1375 if (fcur == cur && layers[0].count == 0)
1376 return cur;
1377 *cur = 255; /* mark end of explicitly cleared cells */
1378 cur++;
1379 /* First pack by layers. */
1380 for (k = 0; k < numlayers; k++)
1381 {
1382 if (layers[k].count == 0)
1383 break; /* once a layer is entirely empty, no layer below it can
1384 have anything in it either */
1385 /* Pack by entries in thie layer */
1386 for (x = 0; x < layers[k].count;)
1387 {
1388 fcur = cur;
1389 *cur = layers[k].lcells[x].face >> 8;
1390 cur++;
1391 *cur = layers[k].lcells[x].face & 0xFF;
1392 cur++;
1393 face = layers[k].lcells[x].face;
1394 /* Now, we back the redundant data into 1 byte xy pairings */
1395 for (y = x; y < layers[k].count; y++)
1396 {
1397 if (layers[k].lcells[y].face == face)
1398 {
1399 *cur = (uint8) layers[k].lcells[y].xy;
1400 cur++;
1401 layers[k].lcells[y].face = -1;
1402 }
1403 }
1404 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1405 /* forward over the now redundant data */
1406 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1407 x++;
1408 }
1409 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1410 }
1411 return cur;
1412}
1413
1414static void
1415esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1416{
1417 static long frames, bytes, tbytes, tframes;
1418 char *cur;
1419 SockList sl;
1420
1421
1422 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1423 strcpy ((char *) sl.buf, "map ");
1424 sl.len = strlen ((char *) sl.buf);
1425
1426 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1427 sl.len = cur - (char *) sl.buf;
1428
1429/* LOG(llevDebug, "Sending map command.\n");*/
1430
1431 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1432 {
1433 /* All of this is just accounting stuff */
1434 if (tframes > 100)
1435 tframes = tbytes = 0;
1436
1437 tframes++;
1438 frames++;
1439 tbytes += sl.len;
1440 bytes += sl.len;
1441 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1442 Send_With_Handling (ns, &sl);
1443 ns->sent_scroll = 0;
1444 }
1445
1446 free (sl.buf);
1447}
1448
1449
1450/** Clears a map cell */ 897/** Clears a map cell */
1451static void 898static void
1452map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 899map_clearcell (struct MapCell *cell, int count)
1453{ 900{
1454 cell->faces[0] = face0; 901 cell->faces[0] = 0;
1455 cell->faces[1] = face1; 902 cell->faces[1] = 0;
1456 cell->faces[2] = face2; 903 cell->faces[2] = 0;
904 cell->smooth[0] = 0;
905 cell->smooth[1] = 0;
906 cell->smooth[2] = 0;
1457 cell->count = count; 907 cell->count = count;
1458 cell->stat_hp = 0; 908 cell->stat_hp = 0;
1459 cell->flags = 0; 909 cell->flags = 0;
1460 cell->player = 0; 910 cell->player = 0;
1461} 911}
1462 912
1463#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1464#define MAX_LAYERS 3 913#define MAX_LAYERS 3
1465
1466/* Using a global really isn't a good approach, but saves the over head of
1467 * allocating and deallocating such a block of data each time run through,
1468 * and saves the space of allocating this in the socket object when we only
1469 * need it for this cycle. If the serve is ever threaded, this needs to be
1470 * re-examined.
1471 */
1472
1473static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1474
1475/**
1476 * Returns true if any of the heads for this
1477 * space is set. Returns false if all are blank - this is used
1478 * for empty space checking.
1479 */
1480static inline int
1481have_head (int ax, int ay)
1482{
1483
1484 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1485 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1486 return 1;
1487 return 0;
1488}
1489
1490/**
1491 * check_head is a bit simplistic version of update_space below.
1492 * basically, it only checks the that the head on space ax,ay at layer
1493 * needs to get sent - if so, it adds the data, sending the head
1494 * if needed, and returning 1. If this no data needs to get
1495 * sent, it returns zero.
1496 */
1497static int
1498check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer)
1499{
1500 short face_num;
1501
1502 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1503 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1504 else
1505 face_num = 0;
1506
1507 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1508 {
1509 SockList_AddShort (&sl, face_num);
1510 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1511 esrv_send_face (&ns, face_num, 0);
1512 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1513 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1514 return 1;
1515 }
1516
1517 return 0; /* No change */
1518}
1519 914
1520/** 915/**
1521 * Removes the need to replicate the same code for each layer. 916 * Removes the need to replicate the same code for each layer.
1522 * this returns true if this space is now in fact different than 917 * this returns true if this space is now in fact different than
1523 * it was. 918 * it was.
1524 * sl is the socklist this data is going into. 919 * sl is the socklist this data is going into.
1525 * ns is the socket we are working on - all the info we care 920 * ns is the socket we are working on - all the info we care
1526 * about is in this socket structure, so now need not pass the 921 * about is in this socket structure, so now need not pass the
1527 * entire player object. 922 * entire player object.
1528 * mx and my are map coordinate offsets for map mp
1529 * sx and sy are the offsets into the socket structure that
1530 * holds the old values.
1531 * layer is the layer to update, with 2 being the floor and 0 the 923 * layer is the layer to update, with 2 being the floor and 0 the
1532 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 924 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1533 * take. Interesting to note that before this function, the map1 function 925 * take. Interesting to note that before this function, the map1 function
1534 * numbers the spaces differently - I think this was a leftover from 926 * numbers the spaces differently - I think this was a leftover from
1535 * the map command, where the faces stack up. Sinces that is no longer 927 * the map command, where the faces stack up. Sinces that is no longer
1536 * the case, it seems to make more sense to have these layer values 928 * the case, it seems to make more sense to have these layer values
1537 * actually match. 929 * actually match.
1538 */ 930 */
1539
1540static int 931static int
1541update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 932update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1542{ 933{
1543 object *ob, *head; 934 object *ob = ms.faces_obj [layer];
1544 uint16 face_num;
1545 int bx, by, i;
1546
1547 /* If there is a multipart object stored away, treat that as more important.
1548 * If not, then do the normal processing.
1549 */
1550
1551 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1552
1553 /* Check to see if this head is part of the set of objects
1554 * we would normally send for this space. If so, then
1555 * don't use the head value. We need to do the check
1556 * here and not when setting up the heads[] value for two reasons -
1557 * 1) the heads[] values will get used even if the space is not visible.
1558 * 2) its possible the head is not on the same map as a part, and I'd
1559 * rather not need to do the map translation overhead.
1560 * 3) We need to do some extra checking to make sure that we will
1561 * otherwise send the image as this layer, eg, either it matches
1562 * the head value, or is not multipart.
1563 */
1564 if (head && !head->more)
1565 {
1566 for (i = 0; i < MAP_LAYERS; i++)
1567 {
1568 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1569 if (!ob)
1570 continue;
1571
1572 if (ob->head)
1573 ob = ob->head;
1574
1575 if (ob == head)
1576 {
1577 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1578 head = NULL;
1579 break;
1580 }
1581 }
1582 }
1583
1584 ob = head;
1585 if (!ob)
1586 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1587 935
1588 /* If there is no object for this space, or if the face for the object 936 /* If there is no object for this space, or if the face for the object
1589 * is the blank face, set the face number to zero. 937 * is the blank face, set the face number to zero.
1590 * else if we have the stored head object for this space, that takes 938 * else if we have the stored head object for this space, that takes
1591 * precedence over the other object for this space. 939 * precedence over the other object for this space.
1592 * otherwise, we do special head processing 940 * otherwise, we do special head processing
1593 */ 941 */
1594 if (!ob || ob->face == blank_face) 942 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1595 face_num = 0;
1596 else if (head)
1597 {
1598 /* if this is a head that had previously been stored */
1599 face_num = ob->face->number;
1600 }
1601 else
1602 {
1603 /* if the faces for the different parts of a multipart object
1604 * are the same, we only want to send the bottom right most
1605 * portion of the object. That info is in the tail_.. values
1606 * of the head. Note that for the head itself, ob->head will
1607 * be null, so we only do this block if we are working on
1608 * a tail piece.
1609 */
1610
1611 /* tail_x and tail_y will only be set in the head object. If
1612 * this is the head object and these are set, we proceed
1613 * with logic to only send bottom right. Similarly, if
1614 * this is one of the more parts but the head has those values
1615 * set, we want to do the processing. There can be cases where
1616 * the head is not visible but one of its parts is, so we just
1617 * can always expect that ob->arch->tail_x will be true for all
1618 * object we may want to display.
1619 */
1620 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1621 {
1622
1623 if (ob->head)
1624 head = ob->head;
1625 else
1626 head = ob;
1627
1628 /* Basically figure out where the offset is from where we are right
1629 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1630 * piece is from the head, and the tail is where the tail is from the
1631 * head. Note that bx and by will equal sx and sy if we are already working
1632 * on the bottom right corner. If ob is the head, the clone values
1633 * will be zero, so the right thing will still happen.
1634 */
1635 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1636 by = sy + head->arch->tail_y - ob->arch->clone.y;
1637
1638 /* I don't think this can ever happen, but better to check for it just
1639 * in case.
1640 */
1641 if (bx < sx || by < sy)
1642 {
1643 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1644 face_num = 0;
1645 }
1646 /* single part object, multipart object with non merged faces,
1647 * of multipart object already at lower right.
1648 */
1649 else if (bx == sx && by == sy)
1650 {
1651 face_num = ob->face->number;
1652
1653 /* if this face matches one stored away, clear that one away.
1654 * this code relies on the fact that the map1 commands
1655 * goes from 2 down to 0.
1656 */
1657 for (i = 0; i < MAP_LAYERS; i++)
1658 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1659 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1660 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1661 }
1662 else
1663 {
1664 /* If this head is stored away, clear it - otherwise,
1665 * there can be cases where a object is on multiple layers -
1666 * we only want to send it once.
1667 */
1668 face_num = head->face->number;
1669 for (i = 0; i < MAP_LAYERS; i++)
1670 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1671 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1672 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1673
1674 /* First, try to put the new head on the same layer. If that is used up,
1675 * then find another layer.
1676 */
1677 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1678 {
1679 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1680 }
1681 else
1682 for (i = 0; i < MAX_LAYERS; i++)
1683 {
1684 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1685 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1686 {
1687 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1688 }
1689 }
1690 face_num = 0; /* Don't send this object - we'll send the head later */
1691 }
1692 }
1693 else
1694 {
1695 /* In this case, we are already at the lower right or single part object,
1696 * so nothing special
1697 */
1698 face_num = ob->face->number;
1699
1700 /* clear out any head entries that have the same face as this one */
1701 for (bx = 0; bx < layer; bx++)
1702 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1703 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1704 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1705 }
1706 } /* else not already head object or blank face */
1707
1708 /* This is a real hack. Basically, if we have nothing to send for this layer,
1709 * but there is a head on the next layer, send that instead.
1710 * Without this, what happens is you can get the case where the player stands
1711 * on the same space as the head. However, if you have overlapping big objects
1712 * of the same type, what happens then is it doesn't think it needs to send
1713 * This tends to make stacking also work/look better.
1714 */
1715 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1716 {
1717 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1718 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1719 }
1720
1721 /* Another hack - because of heads and whatnot, this face may match one
1722 * we already sent for a lower layer. In that case, don't send
1723 * this one.
1724 */
1725 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1726 {
1727 face_num = 0;
1728 }
1729 943
1730 /* We've gotten what face we want to use for the object. Now see if 944 /* We've gotten what face we want to use for the object. Now see if
1731 * if it has changed since we last sent it to the client. 945 * if it has changed since we last sent it to the client.
1732 */ 946 */
1733 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 947 if (lastcell.faces[layer] != face_num)
1734 { 948 {
1735 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 949 lastcell.faces[layer] = face_num;
1736 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 950
951 if (!ns.faces_sent[face_num])
952 if (ob)
953 ns.send_faces (ob);
954 else
1737 esrv_send_face (ns, face_num, 0); 955 ns.send_face (face_num);
1738 SockList_AddShort (sl, face_num); 956
957 sl << uint16 (face_num);
1739 return 1; 958 return 1;
1740 } 959 }
1741 /* Nothing changed */
1742 return 0;
1743}
1744 960
1745/**
1746 * This function is mainly a copy of update_space,
1747 * except it handles update of the smoothing updates,
1748 * not the face updates.
1749 * Removes the need to replicate the same code for each layer.
1750 * this returns true if this smooth is now in fact different
1751 * than it was.
1752 * sl is the socklist this data is going into.
1753 * ns is the socket we are working on - all the info we care
1754 * about is in this socket structure, so know need to pass the
1755 * entire player object.
1756 * mx and my are map coordinate offsets for map mp
1757 * sx and sy are the offsets into the socket structure that
1758 * holds the old values.
1759 * layer is the layer to update, with 2 being the floor and 0 the
1760 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1761 * take.
1762 */
1763
1764static inline int
1765update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1766{
1767 object *ob;
1768 int smoothlevel; /* old face_num; */
1769
1770 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1771
1772 /* If there is no object for this space, or if the face for the object
1773 * is the blank face, set the smoothlevel to zero.
1774 */
1775 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1776 smoothlevel = 0;
1777 else
1778 {
1779 smoothlevel = ob->smoothlevel;
1780 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1781 SendSmooth (ns, ob->face->number);
1782 } /* else not already head object or blank face */
1783
1784 /* We've gotten what face we want to use for the object. Now see if
1785 * if it has changed since we last sent it to the client.
1786 */
1787 if (smoothlevel > 255)
1788 smoothlevel = 255;
1789 else if (smoothlevel < 0)
1790 smoothlevel = 0;
1791 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1792 {
1793 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1794 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF));
1795 return 1;
1796 }
1797 /* Nothing changed */ 961 /* Nothing changed */
1798 return 0; 962 return 0;
1799} 963}
1800 964
1801/** 965/**
1802 * Returns the size of a data for a map square as returned by 966 * Returns the size of a data for a map square as returned by
1803 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 967 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1804 * available. 968 * available.
1805 */ 969 */
1806int 970int
1807getExtendedMapInfoSize (NewSocket * ns) 971getExtendedMapInfoSize (client * ns)
1808{ 972{
1809 int result = 0; 973 int result = 0;
1810 974
1811 if (ns->ext_mapinfos) 975 if (ns->ext_mapinfos)
1812 { 976 {
1813 if (ns->EMI_smooth) 977 if (ns->EMI_smooth)
1814 result += 1; /*One byte for smoothlevel */ 978 result += 1; /*One byte for smoothlevel */
1815 } 979 }
980
1816 return result; 981 return result;
982}
983
984// prefetch (and touch) all maps within a specific distancd
985static void
986prefetch_surrounding_maps (maptile *map, int distance)
987{
988 map->last_access = runtime;
989
990 if (--distance)
991 for (int dir = 4; --dir; )
992 if (const shstr &path = map->tile_path [dir])
993 if (maptile *&neigh = map->tile_map [dir])
994 prefetch_surrounding_maps (neigh, distance);
995 else
996 neigh = maptile::find_async (path, map);
997}
998
999// prefetch a generous area around the player
1000static void
1001prefetch_surrounding_maps (object *op)
1002{
1003 prefetch_surrounding_maps (op->map, 3);
1817} 1004}
1818 1005
1819/** 1006/**
1820 * This function uses the new map1 protocol command to send the map 1007 * This function uses the new map1 protocol command to send the map
1821 * to the client. It is necessary because the old map command supports 1008 * to the client. It is necessary because the old map command supports
… …
1827 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1014 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1828 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1015 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1829 * and use the other 4 bits for other informatiion. For full documentation 1016 * and use the other 4 bits for other informatiion. For full documentation
1830 * of what we send, see the doc/Protocol file. 1017 * of what we send, see the doc/Protocol file.
1831 * I will describe internally what we do: 1018 * I will describe internally what we do:
1832 * the socket->lastmap shows how the map last looked when sent to the client. 1019 * the ns->lastmap shows how the map last looked when sent to the client.
1833 * in the lastmap structure, there is a cells array, which is set to the 1020 * in the lastmap structure, there is a cells array, which is set to the
1834 * maximum viewable size (As set in config.h). 1021 * maximum viewable size (As set in config.h).
1835 * in the cells, there are faces and a count value. 1022 * in the cells, there are faces and a count value.
1836 * we use the count value to hold the darkness value. If -1, then this space 1023 * we use the count value to hold the darkness value. If -1, then this space
1837 * is not viewable. 1024 * is not viewable.
… …
1839 * look like. 1026 * look like.
1840 */ 1027 */
1841void 1028void
1842draw_client_map1 (object *pl) 1029draw_client_map1 (object *pl)
1843{ 1030{
1844 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1845 sint16 nx, ny; 1032 sint16 nx, ny;
1846 int estartlen, eoldlen; 1033 int estartlen, eoldlen;
1847 SockList sl;
1848 SockList esl; /*For extended Map info */
1849 uint16 mask, emask;
1850 uint8 eentrysize; 1034 uint8 eentrysize;
1851 uint16 ewhatstart, ewhatflag; 1035 uint16 ewhatstart, ewhatflag;
1852 uint8 extendedinfos; 1036 uint8 extendedinfos;
1853 maptile *m; 1037 maptile *m;
1854 1038
1855 NewSocket & socket = pl->contr->socket; 1039 client &socket = *pl->contr->ns;
1040
1041 if (!pl->active)
1042 return;
1856 1043
1857 check_map_change (pl->contr); 1044 check_map_change (pl->contr);
1045 prefetch_surrounding_maps (pl);
1858 1046
1859 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1047 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1860 if (socket.mapmode == Map1Cmd) 1048 packet esl;
1861 strcpy ((char *) sl.buf, "map1 "); 1049
1862 else
1863 strcpy ((char *) sl.buf, "map1a ");
1864 sl.len = strlen ((char *) sl.buf);
1865 startlen = sl.len; 1050 startlen = sl.length ();
1866 1051
1867 /*Extendedmapinfo structure initialisation */ 1052 /*Extendedmapinfo structure initialisation */
1868 if (socket.ext_mapinfos) 1053 if (socket.ext_mapinfos)
1869 { 1054 {
1870 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1871 strcpy ((char *) esl.buf, "mapextended ");
1872 esl.len = strlen ((char *) esl.buf);
1873 extendedinfos = EMI_NOREDRAW; 1055 extendedinfos = EMI_NOREDRAW;
1874 1056
1875 if (socket.EMI_smooth) 1057 if (socket.EMI_smooth)
1876 extendedinfos |= EMI_SMOOTH; 1058 extendedinfos |= EMI_SMOOTH;
1877 1059
1878 ewhatstart = esl.len; 1060 ewhatstart = esl.length ();
1879 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1061 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1880 could need to be taken away */ 1062 could need to be taken away */
1881 SockList_AddChar (&esl, extendedinfos);
1882 eentrysize = getExtendedMapInfoSize (&socket); 1063 eentrysize = getExtendedMapInfoSize (&socket);
1883 SockList_AddChar (&esl, eentrysize); 1064 esl << "mapextended "
1065 << uint8 (extendedinfos)
1066 << uint8 (eentrysize);
1067
1884 estartlen = esl.len; 1068 estartlen = esl.length ();
1885 }
1886 else
1887 { 1069 }
1888 /* suppress compiler warnings */
1889 ewhatstart = 0;
1890 ewhatflag = 0;
1891 estartlen = 0;
1892 }
1893
1894 /* Init data to zero */
1895 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1896 1070
1897 /* x,y are the real map locations. ax, ay are viewport relative 1071 /* x,y are the real map locations. ax, ay are viewport relative
1898 * locations. 1072 * locations.
1899 */ 1073 */
1900 ay = 0; 1074 ay = 0;
… …
1903 * but that started to get a bit messy to look at. 1077 * but that started to get a bit messy to look at.
1904 */ 1078 */
1905 max_x = pl->x + (socket.mapx + 1) / 2; 1079 max_x = pl->x + (socket.mapx + 1) / 2;
1906 max_y = pl->y + (socket.mapy + 1) / 2; 1080 max_y = pl->y + (socket.mapy + 1) / 2;
1907 1081
1908 if (socket.mapmode == Map1aCmd) 1082 maptile *plmap = pl->map;
1909 {
1910 max_x += MAX_HEAD_OFFSET;
1911 max_y += MAX_HEAD_OFFSET;
1912 }
1913 1083
1914 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1084 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1915 { 1085 {
1916 ax = 0; 1086 ax = 0;
1917 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1087 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1918 { 1088 {
1919 1089 int emask, mask;
1920 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1090 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1921 1091
1922 /* If this space is out of the normal viewable area, we only check
1923 * the heads value ax or ay will only be greater than what
1924 * the client wants if using the map1a command - this is because
1925 * if the map1a command is not used, max_x and max_y will be
1926 * set to lower values.
1927 */
1928 if (ax >= socket.mapx || ay >= socket.mapy)
1929 {
1930 int i, got_one;
1931
1932 oldlen = sl.len;
1933
1934 SockList_AddShort (&sl, mask);
1935
1936 if (check_head (sl, socket, ax, ay, 2))
1937 mask |= 0x4;
1938 if (check_head (sl, socket, ax, ay, 1))
1939 mask |= 0x2;
1940 if (check_head (sl, socket, ax, ay, 0))
1941 mask |= 0x1;
1942
1943 /* If all we are doing is sending 0 (blank) faces, we don't
1944 * actually need to send that - just the coordinates
1945 * with no faces tells the client to blank out the
1946 * space.
1947 */
1948 got_one = 0;
1949 for (i = oldlen + 2; i < sl.len; i++)
1950 if (sl.buf[i])
1951 got_one = 1;
1952
1953 if (got_one && (mask & 0xf))
1954 sl.buf[oldlen + 1] = mask & 0xff;
1955 else
1956 { /*either all faces blank, either no face at all */
1957 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1958 sl.len = oldlen + 2;
1959 else
1960 sl.len = oldlen;
1961 }
1962
1963 /*What concerns extendinfos, nothing to be done for now
1964 * (perhaps effects layer later)
1965 */
1966 continue; /* don't do processing below */
1967 }
1968
1969 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1092 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1970
1971 d = pl->contr->blocked_los[ax][ay];
1972 1093
1973 /* If the coordinates are not valid, or it is too dark to see, 1094 /* If the coordinates are not valid, or it is too dark to see,
1974 * we tell the client as such 1095 * we tell the client as such
1975 */ 1096 */
1976 nx = x; 1097 nx = x;
1977 ny = y; 1098 ny = y;
1978 m = get_map_from_coord (pl->map, &nx, &ny); 1099 m = get_map_from_coord (plmap, &nx, &ny);
1979 1100
1980 if (!m) 1101 if (!m)
1981 { 1102 {
1982 /* space is out of map. Update space and clear values 1103 /* space is out of map. Update space and clear values
1983 * if this hasn't already been done. If the space is out 1104 * if this hasn't already been done. If the space is out
1984 * of the map, it shouldn't have a head 1105 * of the map, it shouldn't have a head
1985 */ 1106 */
1986 if (lastcell.count != -1) 1107 if (lastcell.count != -1)
1987 { 1108 {
1988 SockList_AddShort (&sl, mask); 1109 sl << uint16 (mask);
1989 map_clearcell (&lastcell, 0, 0, 0, -1); 1110 map_clearcell (&lastcell, -1);
1990 } 1111 }
1112
1113 continue;
1991 } 1114 }
1115
1116 m->touch ();
1117
1118 int d = pl->contr->blocked_los[ax][ay];
1119
1992 else if (d > 3) 1120 if (d > 3)
1993 { 1121 {
1122
1994 int need_send = 0, count; 1123 int need_send = 0, count;
1995 1124
1996 /* This block deals with spaces that are not visible for whatever 1125 /* This block deals with spaces that are not visible for whatever
1997 * reason. Still may need to send the head for this space. 1126 * reason. Still may need to send the head for this space.
1998 */ 1127 */
1999 1128
2000 oldlen = sl.len; 1129 oldlen = sl.length ();
2001 1130
2002 SockList_AddShort (&sl, mask); 1131 sl << uint16 (mask);
2003 1132
2004 if (lastcell.count != -1) 1133 if (lastcell.count != -1)
2005 need_send = 1; 1134 need_send = 1;
2006 1135
2007 count = -1; 1136 count = -1;
2008 1137
2009 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1138 /* properly clear a previously sent big face */
2010 { 1139 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
2011 /* Now check to see if any heads need to be sent */ 1140 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1141 need_send = 1;
2012 1142
2013 if (check_head (sl, socket, ax, ay, 2)) 1143 map_clearcell (&lastcell, count);
2014 mask |= 0x4;
2015 if (check_head (sl, socket, ax, ay, 1))
2016 mask |= 0x2;
2017 if (check_head (sl, socket, ax, ay, 0))
2018 mask |= 0x1;
2019 1144
2020 lastcell.count = count; 1145 if ((mask & 0xf) || need_send)
2021 } 1146 sl[oldlen + 1] = mask & 0xff;
2022 else 1147 else
2023 {
2024 /* properly clear a previously sent big face */
2025 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
2026 || lastcell.stat_hp || lastcell.flags || lastcell.player)
2027 need_send = 1;
2028
2029 map_clearcell (&lastcell, 0, 0, 0, count);
2030 }
2031
2032 if ((mask & 0xf) || need_send)
2033 sl.buf[oldlen + 1] = mask & 0xff;
2034 else
2035 sl.len = oldlen; 1148 sl.reset (oldlen);
2036 } 1149 }
2037 else 1150 else
2038 { 1151 {
2039 /* In this block, the space is visible or there are head objects 1152 /* In this block, the space is visible.
2040 * we need to send.
2041 */ 1153 */
2042 1154
2043 /* Rather than try to figure out what everything that we might 1155 /* Rather than try to figure out what everything that we might
2044 * need to send is, then form the packet after that, 1156 * need to send is, then form the packet after that,
2045 * we presume that we will in fact form a packet, and update 1157 * we presume that we will in fact form a packet, and update
2046 * the bits by what we do actually send. If we send nothing, 1158 * the bits by what we do actually send. If we send nothing,
2047 * we just back out sl.len to the old value, and no harm 1159 * we just back out sl.length () to the old value, and no harm
2048 * is done. 1160 * is done.
2049 * I think this is simpler than doing a bunch of checks to see 1161 * I think this is simpler than doing a bunch of checks to see
2050 * what if anything we need to send, setting the bits, then 1162 * what if anything we need to send, setting the bits, then
2051 * doing those checks again to add the real data. 1163 * doing those checks again to add the real data.
2052 */ 1164 */
2053 oldlen = sl.len; 1165 oldlen = sl.length ();
2054 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2055 eoldlen = esl.len; 1166 eoldlen = esl.length ();
2056 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2057 SockList_AddShort (&sl, mask);
2058 1167
2059 if (socket.ext_mapinfos) 1168 sl << uint16 (mask);
2060 SockList_AddShort (&esl, emask);
2061 1169
2062 unsigned char dummy; 1170 unsigned char dummy;
2063 unsigned char *last_ext = &dummy; 1171 unsigned char *last_ext = &dummy;
2064 1172
2065 /* Darkness changed */ 1173 /* Darkness changed */
… …
2068 mask |= 0x8; 1176 mask |= 0x8;
2069 1177
2070 if (socket.extmap) 1178 if (socket.extmap)
2071 { 1179 {
2072 *last_ext |= 0x80; 1180 *last_ext |= 0x80;
2073 last_ext = sl.buf + sl.len; 1181 last_ext = &sl[sl.length ()];
2074 SockList_AddChar (&sl, d); 1182 sl << uint8 (d);
2075 } 1183 }
2076 else 1184 else
2077 SockList_AddChar (&sl, 255 - 64 * d); 1185 sl << uint8 (255 - 64 * d);
2078 } 1186 }
2079 1187
2080 lastcell.count = d; 1188 lastcell.count = d;
1189
1190 mapspace &ms = m->at (nx, ny);
2081 1191
2082 if (socket.extmap) 1192 if (socket.extmap)
2083 { 1193 {
2084 uint8 stat_hp = 0; 1194 uint8 stat_hp = 0;
2085 uint8 stat_width = 0; 1195 uint8 stat_width = 0;
2086 uint8 flags = 0; 1196 uint8 flags = 0;
2087 tag_t player = 0; 1197 UUID player = 0;
2088 1198
2089 // send hp information, if applicable 1199 // send hp information, if applicable
2090 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1200 if (object *op = ms.faces_obj [0])
2091 { 1201 {
2092 if (op->head || op->invisible) 1202 if (op->head || op->invisible)
2093 ; // do not show 1203 ; // do not show
2094 else if (op->type == PLAYER 1204 else if (op->type == PLAYER
2095 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1205 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
2112 { 1222 {
2113 lastcell.stat_hp = stat_hp; 1223 lastcell.stat_hp = stat_hp;
2114 1224
2115 mask |= 0x8; 1225 mask |= 0x8;
2116 *last_ext |= 0x80; 1226 *last_ext |= 0x80;
2117 last_ext = sl.buf + sl.len; 1227 last_ext = &sl[sl.length ()];
2118 SockList_AddChar (&sl, 5); 1228
2119 SockList_AddChar (&sl, stat_hp); 1229 sl << uint8 (5) << uint8 (stat_hp);
2120 1230
2121 if (stat_width > 1) 1231 if (stat_width > 1)
2122 { 1232 {
2123 *last_ext |= 0x80; 1233 *last_ext |= 0x80;
2124 last_ext = sl.buf + sl.len; 1234 last_ext = &sl[sl.length ()];
2125 SockList_AddChar (&sl, 6); 1235
2126 SockList_AddChar (&sl, stat_width); 1236 sl << uint8 (6) << uint8 (stat_width);
2127 } 1237 }
2128 } 1238 }
2129 1239
2130 if (lastcell.player != player) 1240 if (lastcell.player != player)
2131 { 1241 {
2132 lastcell.player = player; 1242 lastcell.player = player;
2133 1243
2134 mask |= 0x8; 1244 mask |= 0x8;
2135 *last_ext |= 0x80; 1245 *last_ext |= 0x80;
2136 last_ext = sl.buf + sl.len; 1246 last_ext = &sl[sl.length ()];
2137 SockList_AddChar (&sl, 0x47); 1247
2138 SockList_AddChar (&sl, 4); 1248 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2139 SockList_AddInt (&sl, player);
2140 } 1249 }
2141 1250
2142 if (lastcell.flags != flags) 1251 if (lastcell.flags != flags)
2143 { 1252 {
2144 lastcell.flags = flags; 1253 lastcell.flags = flags;
2145 1254
2146 mask |= 0x8; 1255 mask |= 0x8;
2147 *last_ext |= 0x80; 1256 *last_ext |= 0x80;
2148 last_ext = sl.buf + sl.len; 1257 last_ext = &sl[sl.length ()];
2149 SockList_AddChar (&sl, 8); 1258
2150 SockList_AddChar (&sl, flags); 1259 sl << uint8 (8) << uint8 (flags);
2151 } 1260 }
2152 } 1261 }
2153 1262
2154 /* Floor face */ 1263 /* Floor face */
2155 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 1264 if (update_space (sl, socket, ms, lastcell, 2))
2156 mask |= 0x4; 1265 mask |= 0x4;
2157 1266
2158 if (socket.EMI_smooth)
2159 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2))
2160 emask |= 0x4;
2161
2162 /* Middle face */ 1267 /* Middle face */
2163 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 1268 if (update_space (sl, socket, ms, lastcell, 1))
2164 mask |= 0x2; 1269 mask |= 0x2;
2165 1270
2166 if (socket.EMI_smooth) 1271 if (ms.player () == pl
2167 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 1272 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
2168 emask |= 0x2;
2169
2170 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2171 { 1273 {
1274 // force player to be visible to himself if invisible
2172 if (lastcell.faces[0] != pl->face->number) 1275 if (lastcell.faces[0] != pl->face)
2173 { 1276 {
2174 lastcell.faces[0] = pl->face->number; 1277 lastcell.faces[0] = pl->face;
1278
2175 mask |= 0x1; 1279 mask |= 0x1;
1280 sl << uint16 (pl->face);
2176 1281
2177 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1282 socket.send_faces (pl);
2178 esrv_send_face (&socket, pl->face->number, 0);
2179
2180 SockList_AddShort (&sl, pl->face->number);
2181 } 1283 }
2182 } 1284 }
2183 else
2184 {
2185 /* Top face */ 1285 /* Top face */
2186 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 1286 else if (update_space (sl, socket, ms, lastcell, 0))
2187 mask |= 0x1; 1287 mask |= 0x1;
2188
2189 if (socket.EMI_smooth)
2190 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0))
2191 emask |= 0x1;
2192 } 1288
2193 1289
2194 /* Check to see if we are in fact sending anything for this 1290 /* Check to see if we are in fact sending anything for this
2195 * space by checking the mask. If so, update the mask. 1291 * space by checking the mask. If so, update the mask.
2196 * if not, reset the len to that from before adding the mask 1292 * if not, reset the len to that from before adding the mask
2197 * value, so we don't send those bits. 1293 * value, so we don't send those bits.
2198 */ 1294 */
2199 if (mask & 0xf) 1295 if (mask & 0xf)
2200 sl.buf[oldlen + 1] = mask & 0xff; 1296 sl[oldlen + 1] = mask & 0xff;
2201 else 1297 else
2202 sl.len = oldlen; 1298 sl.reset (oldlen);
2203 1299
1300 if (socket.ext_mapinfos)
1301 esl << uint16 (emask);
1302
1303 if (socket.EMI_smooth)
1304 {
1305 for (int layer = 2+1; layer--; )
1306 {
1307 object *ob = ms.faces_obj [layer];
1308
1309 // If there is no object for this space, or if the face for the object
1310 // is the blank face, set the smoothlevel to zero.
1311 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1312
1313 // We've gotten what face we want to use for the object. Now see if
1314 // if it has changed since we last sent it to the client.
1315 if (lastcell.smooth[layer] != smoothlevel)
1316 {
1317 lastcell.smooth[layer] = smoothlevel;
1318 esl << uint8 (smoothlevel);
1319 emask |= 1 << layer;
1320 }
1321 }
1322
2204 if (emask & 0xf) 1323 if (emask & 0xf)
2205 esl.buf[eoldlen + 1] = emask & 0xff; 1324 esl[eoldlen + 1] = emask & 0xff;
2206 else 1325 else
2207 esl.len = eoldlen; 1326 esl.reset (eoldlen);
1327 }
2208 } /* else this is a viewable space */ 1328 } /* else this is a viewable space */
2209 } /* for x loop */ 1329 } /* for x loop */
2210 } /* for y loop */ 1330 } /* for y loop */
2211 1331
2212 /* Verify that we in fact do need to send this */ 1332 /* Verify that we in fact do need to send this */
2213 if (socket.ext_mapinfos) 1333 if (socket.ext_mapinfos)
2214 { 1334 {
2215 if (!(sl.len > startlen || socket.sent_scroll)) 1335 if (!(sl.length () > startlen || socket.sent_scroll))
2216 { 1336 {
2217 /* No map data will follow, so don't say the client 1337 /* No map data will follow, so don't say the client
2218 * it doesn't need draw! 1338 * it doesn't need draw!
2219 */ 1339 */
2220 ewhatflag &= (~EMI_NOREDRAW); 1340 ewhatflag &= ~EMI_NOREDRAW;
2221 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1341 esl[ewhatstart + 1] = ewhatflag & 0xff;
2222 } 1342 }
2223 1343
2224 if (esl.len > estartlen) 1344 if (esl.length () > estartlen)
2225 Send_With_Handling (&socket, &esl); 1345 socket.send_packet (esl);
2226
2227 free (esl.buf);
2228 } 1346 }
2229 1347
2230 if (sl.len > startlen || socket.sent_scroll) 1348 if (sl.length () > startlen || socket.sent_scroll)
2231 { 1349 {
2232 Send_With_Handling (&socket, &sl); 1350 socket.send_packet (sl);
2233 socket.sent_scroll = 0; 1351 socket.sent_scroll = 0;
2234 } 1352 }
2235
2236 free (sl.buf);
2237} 1353}
2238 1354
2239/** 1355/**
2240 * Draws client map. 1356 * Draws client map.
2241 */ 1357 */
2242void 1358void
2243draw_client_map (object *pl) 1359draw_client_map (object *pl)
2244{ 1360{
2245 int i, j; 1361 int i, j;
2246 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1362 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2247 New_Face *face, *floor;
2248 New_Face *floor2;
2249 int d, mflags; 1363 int mflags;
2250 struct Map newmap; 1364 struct Map newmap;
2251 maptile *m, *pm; 1365 maptile *m, *pm;
2252 1366
2253 if (pl->type != PLAYER) 1367 if (pl->type != PLAYER)
2254 { 1368 {
… …
2265 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1379 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2266 return; 1380 return;
2267 1381
2268 memset (&newmap, 0, sizeof (struct Map)); 1382 memset (&newmap, 0, sizeof (struct Map));
2269 1383
2270 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 1384 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2271 {
2272 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 1385 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2273 { 1386 {
2274 ax = i; 1387 ax = i;
2275 ay = j; 1388 ay = j;
2276 m = pm; 1389 m = pm;
2277 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1390 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1391
2278 if (mflags & P_OUT_OF_MAP) 1392 if (mflags & P_OUT_OF_MAP)
2279 continue; 1393 continue;
2280 if (mflags & P_NEED_UPDATE) 1394
2281 update_position (m, ax, ay);
2282 /* If a map is visible to the player, we don't want to swap it out 1395 /* If a map is visible to the player, we don't want to swap it out
2283 * just to reload it. This should really call something like 1396 * just to reload it. This should really call something like
2284 * swap_map, but this is much more efficient and 'good enough' 1397 * swap_map, but this is much more efficient and 'good enough'
2285 */ 1398 */
2286 if (mflags & P_NEW_MAP) 1399 if (mflags & P_NEW_MAP)
2287 m->timeout = 50; 1400 m->timeout = 50;
2288 } 1401 }
2289 } 1402
2290 /* do LOS after calls to update_position */ 1403 /* do LOS after calls to update_position */
2291 if (pl->contr->do_los) 1404 if (pl->contr->do_los)
2292 { 1405 {
2293 update_los (pl); 1406 update_los (pl);
2294 pl->contr->do_los = 0; 1407 pl->contr->do_los = 0;
2295 } 1408 }
2296 1409
2297 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2298 {
2299 /* Big maps need a different drawing mechanism to work */ 1410 /* Big maps need a different drawing mechanism to work */
2300 draw_client_map1 (pl); 1411 draw_client_map1 (pl);
2301 return;
2302 }
2303
2304 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2305 {
2306 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2307 }
2308
2309 /* j and i are the y and x coordinates of the real map (which is
2310 * basically some number of spaces around the player)
2311 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2312 * left corner) and are thus disconnected from the map values.
2313 * Subtract 1 from the max values so that we properly handle cases where
2314 * player has specified an even map. Otherwise, we try to send them too
2315 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2316 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2317 * odd, this still works fine.
2318 */
2319 ay = 0;
2320 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2321 {
2322 ax = 0;
2323 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2324 {
2325
2326 d = pl->contr->blocked_los[ax][ay];
2327 /* note the out_of_map and d>3 checks are both within the same
2328 * negation check.
2329 */
2330 nx = i;
2331 ny = j;
2332 m = get_map_from_coord (pm, &nx, &ny);
2333 if (m && d < 4)
2334 {
2335 face = GET_MAP_FACE (m, nx, ny, 0);
2336 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2337 floor = GET_MAP_FACE (m, nx, ny, 2);
2338
2339 /* If all is blank, send a blank face. */
2340 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2341 {
2342 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2343 }
2344 else
2345 { /* actually have something interesting */
2346 /* send the darkness mask, if any. */
2347 if (d && pl->contr->socket.darkness)
2348 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2349
2350 if (face && face != blank_face)
2351 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2352 if (floor2 && floor2 != blank_face)
2353 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2354 if (floor && floor != blank_face)
2355 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2356 }
2357 } /* Is a valid space */
2358 }
2359 }
2360 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2361
2362 check_map_change (pl->contr);
2363} 1412}
2364 1413
2365 1414
2366/*****************************************************************************/ 1415/*****************************************************************************/
2367 1416
… …
2373 1422
2374/*****************************************************************************/ 1423/*****************************************************************************/
2375void 1424void
2376send_plugin_custom_message (object *pl, char *buf) 1425send_plugin_custom_message (object *pl, char *buf)
2377{ 1426{
2378 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 1427 pl->contr->ns->send_packet (buf);
2379} 1428}
2380 1429
2381/** 1430/**
2382 * This sends the skill number to name mapping. We ignore 1431 * This sends the skill number to name mapping. We ignore
2383 * the params - we always send the same info no matter what. 1432 * the params - we always send the same info no matter what.
2384 */ 1433 */
2385void 1434void
2386send_skill_info (NewSocket * ns, char *params) 1435send_skill_info (client *ns, char *params)
2387{ 1436{
2388 SockList sl; 1437 packet sl;
2389 int i; 1438 sl << "replyinfo skill_info\n";
2390 1439
2391 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2392 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2393 for (i = 1; i < NUM_SKILLS; i++) 1440 for (int i = 1; i < NUM_SKILLS; i++)
2394 { 1441 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2395 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1442
2396 }
2397 sl.len = strlen ((char *) sl.buf);
2398 if (sl.len >= MAXSOCKBUF) 1443 if (sl.length () >= MAXSOCKBUF)
2399 { 1444 {
2400 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1445 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2401 fatal (0); 1446 fatal (0);
2402 } 1447 }
2403 Send_With_Handling (ns, &sl); 1448
2404 free (sl.buf); 1449 ns->send_packet (sl);
2405} 1450}
2406 1451
2407/** 1452/**
2408 * This sends the spell path to name mapping. We ignore 1453 * This sends the spell path to name mapping. We ignore
2409 * the params - we always send the same info no matter what. 1454 * the params - we always send the same info no matter what.
2410 */ 1455 */
2411void 1456void
2412send_spell_paths (NewSocket * ns, char *params) 1457send_spell_paths (client * ns, char *params)
2413{ 1458{
2414 SockList sl; 1459 packet sl;
2415 int i;
2416 1460
2417 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1461 sl << "replyinfo spell_paths\n";
2418 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 1462
2419 for (i = 0; i < NRSPELLPATHS; i++) 1463 for (int i = 0; i < NRSPELLPATHS; i++)
2420 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 1464 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2421 sl.len = strlen ((char *) sl.buf); 1465
2422 if (sl.len >= MAXSOCKBUF) 1466 if (sl.length () >= MAXSOCKBUF)
2423 { 1467 {
2424 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1468 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2425 fatal (0); 1469 fatal (0);
2426 } 1470 }
2427 Send_With_Handling (ns, &sl); 1471
2428 free (sl.buf); 1472 ns->send_packet (sl);
2429} 1473}
2430 1474
2431/** 1475/**
2432 * This looks for any spells the player may have that have changed their stats. 1476 * This looks for any spells the player may have that have changed their stats.
2433 * it then sends an updspell packet for each spell that has changed in this way 1477 * it then sends an updspell packet for each spell that has changed in this way
2434 */ 1478 */
2435void 1479void
2436esrv_update_spells (player *pl) 1480esrv_update_spells (player *pl)
2437{ 1481{
2438 SockList sl; 1482 if (!pl->ns)
2439 int flags = 0;
2440 object *spell;
2441
2442 if (!pl->socket.monitor_spells)
2443 return; 1483 return;
1484
1485 if (!pl->ns->monitor_spells)
1486 return;
1487
2444 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1488 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2445 { 1489 {
2446 if (spell->type == SPELL) 1490 if (spell->type == SPELL)
2447 { 1491 {
1492 int flags = 0;
1493
2448 /* check if we need to update it */ 1494 /* check if we need to update it */
2449 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1495 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2450 { 1496 {
2451 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1497 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2452 flags |= UPD_SP_MANA; 1498 flags |= UPD_SP_MANA;
2453 } 1499 }
1500
2454 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1501 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2455 { 1502 {
2456 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1503 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2457 flags |= UPD_SP_GRACE; 1504 flags |= UPD_SP_GRACE;
2458 } 1505 }
1506
2459 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1507 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2460 { 1508 {
2461 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1509 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2462 flags |= UPD_SP_DAMAGE; 1510 flags |= UPD_SP_DAMAGE;
2463 } 1511 }
1512
2464 if (flags != 0) 1513 if (flags)
2465 { 1514 {
2466 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1515 packet sl;
2467 strcpy ((char *) sl.buf, "updspell "); 1516
2468 sl.len = strlen ((char *) sl.buf); 1517 sl << "updspell "
2469 SockList_AddChar (&sl, flags); 1518 << uint8 (flags)
2470 SockList_AddInt (&sl, spell->count); 1519 << uint32 (spell->count);
2471 if (flags & UPD_SP_MANA) 1520
2472 SockList_AddShort (&sl, spell->last_sp); 1521 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2473 if (flags & UPD_SP_GRACE) 1522 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2474 SockList_AddShort (&sl, spell->last_grace); 1523 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2475 if (flags & UPD_SP_DAMAGE) 1524
2476 SockList_AddShort (&sl, spell->last_eat); 1525 pl->ns->send_packet (sl);
2477 flags = 0;
2478 Send_With_Handling (&pl->socket, &sl);
2479 free (sl.buf);
2480 } 1526 }
2481 } 1527 }
2482 } 1528 }
2483} 1529}
2484 1530
2485void 1531void
2486esrv_remove_spell (player *pl, object *spell) 1532esrv_remove_spell (player *pl, object *spell)
2487{ 1533{
2488 SockList sl;
2489
2490 if (!pl->socket.monitor_spells) 1534 if (!pl->ns->monitor_spells)
2491 return; 1535 return;
1536
2492 if (!pl || !spell || spell->env != pl->ob) 1537 if (!pl || !spell || spell->env != pl->ob)
2493 { 1538 {
2494 LOG (llevError, "Invalid call to esrv_remove_spell"); 1539 LOG (llevError, "Invalid call to esrv_remove_spell");
2495 return; 1540 return;
2496 } 1541 }
2497 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1542
2498 strcpy ((char *) sl.buf, "delspell "); 1543 packet sl ("delspell");
2499 sl.len = strlen ((char *) sl.buf); 1544
2500 SockList_AddInt (&sl, spell->count); 1545 sl << uint32 (spell->count);
2501 Send_With_Handling (&pl->socket, &sl); 1546
2502 free (sl.buf); 1547 pl->ns->send_packet (sl);
2503} 1548}
2504 1549
2505/* appends the spell *spell to the Socklist we will send the data to. */ 1550/* appends the spell *spell to the Socklist we will send the data to. */
2506static void 1551static void
2507append_spell (player *pl, SockList * sl, object *spell) 1552append_spell (player *pl, packet &sl, object *spell)
2508{ 1553{
2509 int len, i, skill = 0; 1554 int i, skill = 0;
2510 1555
2511 if (!(spell->name)) 1556 if (!(spell->name))
2512 { 1557 {
2513 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1558 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2514 return; 1559 return;
2515 } 1560 }
2516 SockList_AddInt (sl, spell->count); 1561
2517 SockList_AddShort (sl, spell->level);
2518 SockList_AddShort (sl, spell->casting_time);
2519 /* store costs and damage in the object struct, to compare to later */ 1562 /* store costs and damage in the object struct, to compare to later */
2520 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1563 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2521 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1564 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2522 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1565 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2523 /* send the current values */
2524 SockList_AddShort (sl, spell->last_sp);
2525 SockList_AddShort (sl, spell->last_grace);
2526 SockList_AddShort (sl, spell->last_eat);
2527 1566
2528 /* figure out which skill it uses, if it uses one */ 1567 /* figure out which skill it uses, if it uses one */
2529 if (spell->skill) 1568 if (spell->skill)
2530 { 1569 {
2531 for (i = 1; i < NUM_SKILLS; i++) 1570 for (i = 1; i < NUM_SKILLS; i++)
… …
2533 { 1572 {
2534 skill = i + CS_STAT_SKILLINFO; 1573 skill = i + CS_STAT_SKILLINFO;
2535 break; 1574 break;
2536 } 1575 }
2537 } 1576 }
2538 SockList_AddChar (sl, skill);
2539 1577
2540 SockList_AddInt (sl, spell->path_attuned); 1578 // spells better have a face
2541 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0);
2542
2543 len = strlen (spell->name);
2544 SockList_AddChar (sl, (char) len);
2545 memcpy (sl->buf + sl->len, spell->name, len);
2546 sl->len += len;
2547
2548 if (!spell->msg) 1579 if (!spell->face)
2549 {
2550 SockList_AddShort (sl, 0);
2551 } 1580 {
2552 else 1581 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1582 spell->face = face_find ("burnout.x11", blank_face);
2553 { 1583 }
2554 len = strlen (spell->msg); 1584
2555 SockList_AddShort (sl, len); 1585 /* send the current values */
2556 memcpy (sl->buf + sl->len, spell->msg, len); 1586 sl << uint32 (spell->count)
2557 sl->len += len; 1587 << uint16 (spell->level)
2558 } 1588 << uint16 (spell->casting_time)
1589 << uint16 (spell->last_sp)
1590 << uint16 (spell->last_grace)
1591 << uint16 (spell->last_eat)
1592 << uint8 (skill)
1593 << uint32 (spell->path_attuned)
1594 << uint32 (spell->face)
1595 << data8 (spell->name)
1596 << data16 (spell->msg);
2559} 1597}
2560 1598
2561/** 1599/**
2562 * This tells the client to add the spell *ob, if *ob is NULL, then add 1600 * This tells the client to add the spell *ob, if *ob is NULL, then add
2563 * all spells in the player's inventory. 1601 * all spells in the player's inventory.
2564 */ 1602 */
2565void 1603void
2566esrv_add_spells (player *pl, object *spell) 1604esrv_add_spells (player *pl, object *spell)
2567{ 1605{
2568 SockList sl;
2569
2570 if (!pl) 1606 if (!pl)
2571 { 1607 {
2572 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1608 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2573 return; 1609 return;
2574 } 1610 }
1611
2575 if (!pl->socket.monitor_spells) 1612 if (!pl->ns->monitor_spells)
2576 return; 1613 return;
2577 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1614
2578 strcpy ((char *) sl.buf, "addspell "); 1615 packet sl ("addspell");
2579 sl.len = strlen ((char *) sl.buf); 1616
2580 if (!spell) 1617 if (!spell)
2581 { 1618 {
2582 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1619 for (spell = pl->ob->inv; spell; spell = spell->below)
2583 { 1620 {
2584 /* were we to simply keep appending data here, we could exceed 1621 /* were we to simply keep appending data here, we could exceed
2585 * MAXSOCKBUF if the player has enough spells to add, we know that 1622 * MAXSOCKBUF if the player has enough spells to add, we know that
2586 * append_spells will always append 19 data bytes, plus 4 length 1623 * append_spells will always append 19 data bytes, plus 4 length
2587 * bytes and 3 strings (because that is the spec) so we need to 1624 * bytes and 3 strings (because that is the spec) so we need to
… …
2594 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1631 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2595 * like it will fix this 1632 * like it will fix this
2596 */ 1633 */
2597 if (spell->type != SPELL) 1634 if (spell->type != SPELL)
2598 continue; 1635 continue;
1636
2599 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1637 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2600 { 1638 {
2601 Send_With_Handling (&pl->socket, &sl); 1639 pl->ns->send_packet (sl);
2602 strcpy ((char *) sl.buf, "addspell "); 1640
2603 sl.len = strlen ((char *) sl.buf); 1641 sl.reset ();
1642 sl << "addspell ";
2604 } 1643 }
1644
2605 append_spell (pl, &sl, spell); 1645 append_spell (pl, sl, spell);
2606 } 1646 }
2607 } 1647 }
2608 else if (spell->type != SPELL) 1648 else if (spell->type != SPELL)
2609 { 1649 {
2610 LOG (llevError, "Asked to send a non-spell object as a spell"); 1650 LOG (llevError, "Asked to send a non-spell object as a spell");
2611 return; 1651 return;
2612 } 1652 }
2613 else 1653 else
2614 append_spell (pl, &sl, spell); 1654 append_spell (pl, sl, spell);
1655
2615 if (sl.len >= MAXSOCKBUF) 1656 if (sl.length () >= MAXSOCKBUF)
2616 { 1657 {
2617 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1658 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2618 fatal (0); 1659 fatal (0);
2619 } 1660 }
1661
2620 /* finally, we can send the packet */ 1662 /* finally, we can send the packet */
2621 Send_With_Handling (&pl->socket, &sl); 1663 pl->ns->send_packet (sl);
2622 free (sl.buf);
2623} 1664}
1665

Diff Legend

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