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.31 by root, Thu Dec 14 00:23:59 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
688 /* If we can't find a face, return and set it so we won't try to send this
689 * again.
690 */
691 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
692 {
693
694 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
695 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
696 return;
697 }
698
699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
700 esrv_send_face (ns, smoothface, 0);
701
702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
703
704 SockList sl (MAXSOCKBUF);
705
706 sl << "smooth "
707 << uint16 (face)
708 << uint16 (smoothface);
709
710 Send_With_Handling (ns, &sl);
711 sl.free ();
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 511
727/** 512/**
728 * 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,
729 * etc.) 514 * etc.)
730 */ 515 */
731void 516void
732PlayerCmd (char *buf, int len, player *pl) 517PlayerCmd (char *buf, int len, player *pl)
733{ 518{
734
735 /* The following should never happen with a proper or honest client.
736 * Therefore, the error message doesn't have to be too clear - if
737 * someone is playing with a hacked/non working client, this gives them
738 * an idea of the problem, but they deserve what they get
739 */
740 if (pl->state != ST_PLAYING)
741 {
742 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
743 return;
744 }
745 /* 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
746 * sent, so check for that also. 520 * sent, so check for that also.
747 */ 521 */
748 if (atoi (buf) || buf[0] == '0') 522 if (atoi (buf) || buf[0] == '0')
749 { 523 {
750 pl->count = atoi ((char *) buf); 524 pl->count = atoi ((char *) buf);
525
751 buf = strchr (buf, ' '); /* advance beyond the numbers */ 526 buf = strchr (buf, ' '); /* advance beyond the numbers */
752 if (!buf) 527 if (!buf)
753 {
754#ifdef ESRV_DEBUG
755 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
756#endif
757 return; 528 return;
758 } 529
759 buf++; 530 buf++;
760 } 531 }
761 /* This should not happen anymore. */ 532
762 if (pl->ob->speed_left < -1.0)
763 {
764 LOG (llevError, "Player has negative time - shouldn't do command.\n");
765 }
766 /* In c_new.c */
767 execute_newserver_command (pl->ob, (char *) buf); 533 execute_newserver_command (pl->ob, (char *) buf);
768 /* Perhaps something better should be done with a left over count.
769 * Cleaning up the input should probably be done first - all actions
770 * for the command that issued the count should be done before any other
771 * commands.
772 */
773 534
774 pl->count = 0;
775
776}
777
778
779/**
780 * This handles the general commands from the client (ie, north, fire, cast,
781 * etc.). It is a lot like PlayerCmd above, but is called with the
782 * 'ncom' method which gives more information back to the client so it
783 * can throttle.
784 */
785void
786NewPlayerCmd (uint8 * buf, int len, player *pl)
787{
788 int time, repeat;
789 char command[MAX_BUF];
790 short packet;
791
792 if (len < 7)
793 {
794 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
795 return;
796 }
797
798 packet = net_uint16 (buf);
799 repeat = net_uint32 (buf + 2);
800
801 /* -1 is special - no repeat, but don't update */
802 if (repeat != -1)
803 pl->count = repeat;
804
805 if ((len - 4) >= MAX_BUF)
806 len = MAX_BUF - 5;
807
808 strncpy ((char *) command, (char *) buf + 6, len - 4);
809 command[len - 4] = '\0';
810
811 /* The following should never happen with a proper or honest client.
812 * Therefore, the error message doesn't have to be too clear - if
813 * someone is playing with a hacked/non working client, this gives them
814 * an idea of the problem, but they deserve what they get
815 */
816 if (pl->state != ST_PLAYING)
817 {
818 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
819 return;
820 }
821
822 /* This should not happen anymore. */
823 if (pl->ob->speed_left < -1.0)
824 LOG (llevError, "Player has negative time - shouldn't do command.\n");
825
826 /* In c_new.c */
827 execute_newserver_command (pl->ob, (char *) command);
828 /* Perhaps something better should be done with a left over count. 535 /* Perhaps something better should be done with a left over count.
829 * Cleaning up the input should probably be done first - all actions 536 * Cleaning up the input should probably be done first - all actions
830 * 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
831 * commands. 538 * commands.
832 */ 539 */
833 pl->count = 0; 540 pl->count = 0;
541}
834 542
835 if (FABS (pl->ob->speed) < 0.001) 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
836 time = MAX_TIME * 100; 579 ? time = MAX_TIME * 100
837 else
838 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 580 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
839 581
840 /* Send confirmation of command execution now */ 582 /* Send confirmation of command execution now */
841 583 packet sl ("comc");
842 SockList sl (MAXSOCKBUF);
843 sl << "comc " << uint16 (packet) << uint32 (time); 584 sl << uint16 (cmdid) << uint32 (time);
844 Send_With_Handling (&pl->socket, &sl); 585 pl->ns->send_packet (sl);
845 sl.free ();
846} 586}
847
848 587
849/** This is a reply to a previous query. */ 588/** This is a reply to a previous query. */
850void 589void
851ReplyCmd (char *buf, int len, player *pl) 590ReplyCmd (char *buf, int len, client *ns)
852{ 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
853 /* 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
854 * 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
855 * once all the X11 code is removed from the server. 606 * once all the X11 code is removed from the server.
856 * 607 *
857 * 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
858 * think it was the carriage return that was entered, and the 609 * think it was the carriage return that was entered, and the
859 * function then does not try to do additional input. 610 * function then does not try to do additional input.
860 */ 611 */
861 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 612 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
862 613
863 /* this avoids any hacking here */ 614 /* this avoids any hacking here */
864 615
865 switch (pl->state) 616 switch (ns->state)
866 { 617 {
867 case ST_PLAYING: 618 case ST_PLAYING:
868 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 619 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
869 break; 620 break;
870 621
871 case ST_PLAY_AGAIN:
872 /* We can check this for return value (2==quit). Maybe we
873 * should, and do something appropriate?
874 */
875 receive_play_again (pl->ob, buf[0]);
876 break;
877
878 case ST_ROLL_STAT:
879 key_roll_stat (pl->ob, buf[0]);
880 break;
881
882 case ST_CHANGE_CLASS: 622 case ST_CHANGE_CLASS:
883
884 key_change_class (pl->ob, buf[0]); 623 key_change_class (pl->ob, buf[0]);
885 break; 624 break;
886 625
887 case ST_CONFIRM_QUIT:
888 key_confirm_quit (pl->ob, buf[0]);
889 break;
890
891 case ST_CONFIGURE:
892 LOG (llevError, "In client input handling, but into configure state\n");
893 pl->state = ST_PLAYING;
894 break;
895
896 case ST_GET_NAME:
897 receive_player_name (pl->ob, 13);
898 break;
899
900 case ST_GET_PASSWORD:
901 case ST_CONFIRM_PASSWORD:
902 receive_player_password (pl->ob, 13);
903 break;
904
905 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 626 case ST_GET_PARTY_PASSWORD: /* Get password for party */
906 receive_party_password (pl->ob, 13); 627 receive_party_password (pl->ob, 13);
907 break; 628 break;
908 629
909 default: 630 default:
910 LOG (llevError, "Unknown input state: %d\n", pl->state); 631 LOG (llevError, "Unknown input state: %d\n", ns->state);
911 } 632 }
912} 633}
913 634
914/** 635/**
915 * 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
… …
917 * 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
918 * 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
919 * problem. 640 * problem.
920 */ 641 */
921void 642void
922VersionCmd (char *buf, int len, NewSocket * ns) 643VersionCmd (char *buf, int len, client * ns)
923{ 644{
924 char *cp;
925 char version_warning[256];
926
927 if (!buf) 645 if (!buf)
928 { 646 {
929 LOG (llevError, "CS: received corrupted version command\n"); 647 LOG (llevError, "CS: received corrupted version command\n");
930 return; 648 return;
931 } 649 }
932 650
933 ns->cs_version = atoi (buf); 651 ns->cs_version = atoi (buf);
934 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
935 if (VERSION_CS != ns->cs_version) 658 //if (VERSION_CS != ns->cs_version)
936 { 659 // unchecked;
937#ifdef ESRV_DEBUG 660
938 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
939#endif
940 }
941 cp = strchr (buf + 1, ' '); 661 char *cp = strchr (buf + 1, ' ');
942 if (!cp) 662 if (!cp)
943 return; 663 return;
664
944 ns->sc_version = atoi (cp); 665 ns->sc_version = atoi (cp);
666
945 if (VERSION_SC != ns->sc_version) 667 //if (VERSION_SC != ns->sc_version)
946 { 668 // unchecked;
947#ifdef ESRV_DEBUG 669
948 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
949#endif
950 }
951 cp = strchr (cp + 1, ' '); 670 cp = strchr (cp + 1, ' ');
671
952 if (cp) 672 if (cp)
953 { 673 {
954 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 674 assign (ns->version, cp + 1);
955 675
956 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
957
958 /* This is first implementation - i skip all beta DX clients with it
959 * Add later stuff here for other clients
960 */
961
962 /* these are old dxclients */
963 /* Version 1024 added support for singular + plural name values -
964 * requiing this minimal value reduces complexity of that code, and it
965 * has been around for a long time.
966 */
967 if (ns->sc_version < 1026) 676 if (ns->sc_version < 1026)
968 { 677 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
969 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
970 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 678 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
971 Write_String_To_Socket (ns, version_warning, strlen (version_warning));
972 }
973
974 } 679 }
975} 680}
976 681
977/** sound related functions. */ 682/** sound related functions. */
978
979void 683void
980SetSound (char *buf, int len, NewSocket * ns) 684SetSound (char *buf, int len, client * ns)
981{ 685{
982 ns->sound = atoi (buf); 686 ns->sound = atoi (buf);
983} 687}
984 688
985/** client wants the map resent */ 689/** client wants the map resent */
986
987void 690void
988MapRedrawCmd (char *buf, int len, player *pl) 691MapRedrawCmd (char *buf, int len, player *pl)
989{ 692{
990
991/* 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
992 * 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.
993 * Unfortunately this solution does not work because some client versions send 695 * Unfortunately this solution does not work because some client versions send
994 * a mapredraw command after receiving a newmap command. 696 * a mapredraw command after receiving a newmap command.
995 */ 697 */
996#if 0
997 /* Okay, this is MAJOR UGLY. but the only way I know how to
998 * clear the "cache"
999 */
1000 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1001 draw_client_map (pl->ob);
1002#endif
1003} 698}
1004 699
1005/** 700/**
1006 * Moves an object (typically, container to inventory). 701 * Moves an object (typically, container to inventory).
1007 * syntax is: move (to) (tag) (nrof) 702 * syntax is: move (to) (tag) (nrof)
… …
1010MoveCmd (char *buf, int len, player *pl) 705MoveCmd (char *buf, int len, player *pl)
1011{ 706{
1012 int vals[3], i; 707 int vals[3], i;
1013 708
1014 /* A little funky here. We only cycle for 2 records, because 709 /* A little funky here. We only cycle for 2 records, because
1015 * 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
1016 * record. Perhaps we should just replace this with a 711 * record. Perhaps we should just replace this with a
1017 * sscanf? 712 * sscanf?
1018 */ 713 */
1019 for (i = 0; i < 2; i++) 714 for (i = 0; i < 2; i++)
1020 { 715 {
1021 vals[i] = atoi (buf); 716 vals[i] = atoi (buf);
717
1022 if (!(buf = strchr (buf, ' '))) 718 if (!(buf = strchr (buf, ' ')))
1023 { 719 {
1024 LOG (llevError, "Incomplete move command: %s\n", buf); 720 LOG (llevError, "Incomplete move command: %s\n", buf);
1025 return; 721 return;
1026 } 722 }
723
1027 buf++; 724 buf++;
1028 } 725 }
726
1029 vals[2] = atoi (buf); 727 vals[2] = atoi (buf);
1030 728
1031/* 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]);*/
1032 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 730 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1033} 731}
1034
1035
1036 732
1037/****************************************************************************** 733/******************************************************************************
1038 * 734 *
1039 * Start of commands the server sends to the client. 735 * Start of commands the server sends to the client.
1040 * 736 *
… …
1043/** 739/**
1044 * 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
1045 * 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)
1046 */ 742 */
1047void 743void
1048send_query (NewSocket * ns, uint8 flags, char *text) 744send_query (client *ns, uint8 flags, const char *text)
1049{ 745{
1050 char buf[MAX_BUF];
1051
1052 sprintf (buf, "query %d %s", flags, text ? text : ""); 746 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1053 Write_String_To_Socket (ns, buf, strlen (buf));
1054} 747}
1055 748
1056#define AddIfInt64(Old,New,Type) if (Old != New) {\ 749#define AddIfInt64(Old,New,Type) if (Old != New) {\
1057 Old = New; \ 750 Old = New; \
1058 sl << uint8 (Type) << uint64 (New); \ 751 sl << uint8 (Type) << uint64 (New); \
… …
1088esrv_update_stats (player *pl) 781esrv_update_stats (player *pl)
1089{ 782{
1090 char buf[MAX_BUF]; 783 char buf[MAX_BUF];
1091 uint16 flags; 784 uint16 flags;
1092 785
1093 SockList sl (MAXSOCKBUF); 786 client *ns = pl->ns;
1094 sl << "stats "; 787 if (!ns)
788 return;
1095 789
1096 if (pl->ob != NULL) 790 object *ob = pl->ob;
1097 { 791 if (!ob)
792 return;
793
794 packet sl ("stats");
795
1098 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 796 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1099 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 797 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1100 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 798 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1101 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 799 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1102 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 800 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1103 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 801 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1104 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 802 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1105 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1106 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1107 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1108 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 803 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1109 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);
1110 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 808 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1111 }
1112 809
1113 if (pl->socket.exp64)
1114 {
1115 uint8 s;
1116
1117 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])
1118 { 813 {
1119 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;
1120 { 815
1121 /* Always send along the level if exp changes. This is only 816 /* Always send along the level if exp changes. This is only
1122 * 1 extra byte, but keeps processing simpler. 817 * 1 extra byte, but keeps processing simpler.
1123 */ 818 */
1124 sl << uint8 (s + CS_STAT_SKILLINFO) 819 sl << uint8 (s + CS_STAT_SKILLINFO)
1125 << uint8 (pl->last_skill_ob[s]->level) 820 << uint8 (skill->level)
1126 << uint64 (pl->last_skill_ob[s]->stats.exp); 821 << uint64 (skill->stats.exp);
1127
1128 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1129 }
1130 } 822 }
1131 }
1132 823
1133 if (pl->socket.exp64)
1134 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 824 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1135 else
1136 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1137
1138 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 825 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1139 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 826 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1140 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 827 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1141 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 828 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1142 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 829 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1143 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 830 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1144 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);
1145 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
1146 flags = 0; 834 flags = 0;
1147 835
1148 if (pl->fire_on) 836 if (pl->fire_on)
1149 flags |= SF_FIREON; 837 flags |= SF_FIREON;
1150 838
1151 if (pl->run_on) 839 if (pl->run_on)
1152 flags |= SF_RUNON; 840 flags |= SF_RUNON;
1153 841
1154 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 842 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1155 843
1156 if (pl->socket.sc_version < 1025) 844 if (ns->sc_version < 1025)
1157 { 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) }
1158 else 846 else
1159 {
1160 int i;
1161
1162 for (i = 0; i < NROFATTACKS; i++) 847 for (int i = 0; i < NROFATTACKS; i++)
1163 { 848 {
1164 /* Skip ones we won't send */ 849 /* Skip ones we won't send */
1165 if (atnr_cs_stat[i] == -1) 850 if (atnr_cs_stat[i] == -1)
1166 continue; 851 continue;
1167 852
1168 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]);
1169 } 854 }
1170 }
1171 855
1172 if (pl->socket.monitor_spells) 856 if (pl->ns->monitor_spells)
1173 { 857 {
1174 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);
1175 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);
1176 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);
1177 } 861 }
1178 862
1179 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 */
1180 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 864 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1181 set_title (pl->ob, buf); 865 set_title (ob, buf);
1182 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 866 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1183 867
1184 /* Only send it away if we have some actual data */ 868 /* Only send it away if we have some actual data */
1185 if (sl.len > 6) 869 if (sl.length () > 6)
1186 { 870 ns->send_packet (sl);
1187#ifdef ESRV_DEBUG
1188 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1189#endif
1190 Send_With_Handling (&pl->socket, &sl);
1191 }
1192
1193 sl.free ();
1194} 871}
1195 872
1196/** 873/**
1197 * 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.
1198 */ 875 */
1199void 876void
1200esrv_new_player (player *pl, uint32 weight) 877esrv_new_player (player *pl, uint32 weight)
1201{ 878{
1202 pl->last_weight = weight; 879 packet sl ("player");
1203
1204 SockList sl (MAXSOCKBUF);
1205 sl << "player ";
1206 880
1207 sl << uint32 (pl->ob->count) 881 sl << uint32 (pl->ob->count)
1208 << uint32 (weight) 882 << uint32 (weight)
1209 << uint32 (pl->ob->face->number) 883 << uint32 (pl->ob->face)
1210 << data8 (pl->ob->name); 884 << data8 (pl->ob->name);
1211 885
1212 Send_With_Handling (&pl->socket, &sl); 886 pl->ns->last_weight = weight;
1213 sl.free (); 887 pl->ns->send_packet (sl);
1214 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 888 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1215} 889}
1216
1217/**
1218 * Need to send an animation sequence to the client.
1219 * We will send appropriate face commands to the client if we haven't
1220 * sent them the face yet (this can become quite costly in terms of
1221 * how much we are sending - on the other hand, this should only happen
1222 * when the player logs in and picks stuff up.
1223 */
1224void
1225esrv_send_animation (NewSocket * ns, short anim_num)
1226{
1227 int i;
1228
1229 /* Do some checking on the anim_num we got. Note that the animations
1230 * are added in contigous order, so if the number is in the valid
1231 * range, it must be a valid animation.
1232 */
1233 if (anim_num < 0 || anim_num > num_animations)
1234 {
1235 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1236 return;
1237 }
1238
1239 SockList sl (MAXSOCKBUF);
1240
1241 sl << "anim "
1242 << uint16 (anim_num)
1243 << uint16 (0); /* flags - not used right now */
1244
1245 /* Build up the list of faces. Also, send any information (ie, the
1246 * the face itself) down to the client.
1247 */
1248 for (i = 0; i < animations[anim_num].num_animations; i++)
1249 {
1250 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1251 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1252 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1253 }
1254
1255 Send_With_Handling (ns, &sl);
1256 sl.free ();
1257
1258 ns->anims_sent[anim_num] = 1;
1259}
1260
1261 890
1262/****************************************************************************** 891/******************************************************************************
1263 * 892 *
1264 * Start of map related commands. 893 * Start of map related commands.
1265 * 894 *
1266 ******************************************************************************/ 895 ******************************************************************************/
1267 896
1268/**
1269 * This adds face_num to a map cell at x,y. If the client doesn't have
1270 * the face yet, we will also send it.
1271 */
1272static void
1273esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap)
1274{
1275 if (newmap->cells[x][y].count >= MAP_LAYERS)
1276 {
1277 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1278 return;
1279 abort ();
1280 }
1281
1282 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1283 newmap->cells[x][y].count++;
1284
1285 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1286 esrv_send_face (ns, face_num, 0);
1287}
1288
1289struct LayerCell
1290{
1291 uint16 xy;
1292 short face;
1293};
1294
1295struct MapLayer
1296{
1297 int count;
1298 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1299};
1300
1301/** Checkes if map cells have changed */
1302static int
1303mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1304{
1305 int k;
1306
1307 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1308 return 1;
1309 for (k = 0; k < newmap->cells[i][j].count; k++)
1310 {
1311 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1312 {
1313 return 1;
1314 }
1315 }
1316 return 0;
1317}
1318
1319/**
1320 * Basically, what this does is pack the data into layers.
1321 * cnum is the client number, cur is the the buffer we put all of
1322 * this data into. we return the end of the data. layers is
1323 * how many layers of data we should back.
1324 */
1325static uint8 *
1326compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1327{
1328 int x, y, k;
1329 int face;
1330 unsigned char *fcur;
1331 struct MapLayer layers[MAP_LAYERS];
1332
1333 for (k = 0; k < MAP_LAYERS; k++)
1334 layers[k].count = 0;
1335 fcur = cur;
1336 for (x = 0; x < ns->mapx; x++)
1337 {
1338 for (y = 0; y < ns->mapy; y++)
1339 {
1340 if (!mapcellchanged (ns, x, y, newmap))
1341 continue;
1342 if (newmap->cells[x][y].count == 0)
1343 {
1344 *cur = x * ns->mapy + y; /* mark empty space */
1345 cur++;
1346 continue;
1347 }
1348 for (k = 0; k < newmap->cells[x][y].count; k++)
1349 {
1350 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1351 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1352 layers[k].count++;
1353 }
1354 }
1355 }
1356 /* If no data, return now. */
1357 if (fcur == cur && layers[0].count == 0)
1358 return cur;
1359 *cur = 255; /* mark end of explicitly cleared cells */
1360 cur++;
1361 /* First pack by layers. */
1362 for (k = 0; k < numlayers; k++)
1363 {
1364 if (layers[k].count == 0)
1365 break; /* once a layer is entirely empty, no layer below it can
1366 have anything in it either */
1367 /* Pack by entries in thie layer */
1368 for (x = 0; x < layers[k].count;)
1369 {
1370 fcur = cur;
1371 *cur = layers[k].lcells[x].face >> 8;
1372 cur++;
1373 *cur = layers[k].lcells[x].face & 0xFF;
1374 cur++;
1375 face = layers[k].lcells[x].face;
1376 /* Now, we back the redundant data into 1 byte xy pairings */
1377 for (y = x; y < layers[k].count; y++)
1378 {
1379 if (layers[k].lcells[y].face == face)
1380 {
1381 *cur = (uint8) layers[k].lcells[y].xy;
1382 cur++;
1383 layers[k].lcells[y].face = -1;
1384 }
1385 }
1386 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1387 /* forward over the now redundant data */
1388 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1389 x++;
1390 }
1391 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1392 }
1393 return cur;
1394}
1395
1396static void
1397esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1398{
1399 static long frames, bytes, tbytes, tframes;
1400 char *cur;
1401
1402 SockList sl (MAXSOCKBUF);
1403 sl << "map ";
1404
1405 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1406 sl.len = cur - (char *) sl.buf;
1407
1408/* LOG(llevDebug, "Sending map command.\n");*/
1409
1410 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1411 {
1412 /* All of this is just accounting stuff */
1413 if (tframes > 100)
1414 tframes = tbytes = 0;
1415
1416 tframes++;
1417 frames++;
1418 tbytes += sl.len;
1419 bytes += sl.len;
1420 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1421 Send_With_Handling (ns, &sl);
1422 ns->sent_scroll = 0;
1423 }
1424
1425 sl.free ();
1426}
1427
1428
1429/** Clears a map cell */ 897/** Clears a map cell */
1430static void 898static void
1431map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 899map_clearcell (struct MapCell *cell, int count)
1432{ 900{
1433 cell->faces[0] = face0; 901 cell->faces[0] = 0;
1434 cell->faces[1] = face1; 902 cell->faces[1] = 0;
1435 cell->faces[2] = face2; 903 cell->faces[2] = 0;
904 cell->smooth[0] = 0;
905 cell->smooth[1] = 0;
906 cell->smooth[2] = 0;
1436 cell->count = count; 907 cell->count = count;
1437 cell->stat_hp = 0; 908 cell->stat_hp = 0;
1438 cell->flags = 0; 909 cell->flags = 0;
1439 cell->player = 0; 910 cell->player = 0;
1440} 911}
1441 912
1442#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1443#define MAX_LAYERS 3 913#define MAX_LAYERS 3
1444
1445/* Using a global really isn't a good approach, but saves the over head of
1446 * allocating and deallocating such a block of data each time run through,
1447 * and saves the space of allocating this in the socket object when we only
1448 * need it for this cycle. If the serve is ever threaded, this needs to be
1449 * re-examined.
1450 */
1451
1452static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1453
1454/**
1455 * Returns true if any of the heads for this
1456 * space is set. Returns false if all are blank - this is used
1457 * for empty space checking.
1458 */
1459static inline int
1460have_head (int ax, int ay)
1461{
1462
1463 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1464 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1465 return 1;
1466 return 0;
1467}
1468
1469/**
1470 * check_head is a bit simplistic version of update_space below.
1471 * basically, it only checks the that the head on space ax,ay at layer
1472 * needs to get sent - if so, it adds the data, sending the head
1473 * if needed, and returning 1. If this no data needs to get
1474 * sent, it returns zero.
1475 */
1476static int
1477check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer)
1478{
1479 short face_num;
1480
1481 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1482 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1483 else
1484 face_num = 0;
1485
1486 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1487 {
1488 sl << uint16 (face_num);
1489 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1490 esrv_send_face (&ns, face_num, 0);
1491
1492 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1493 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1494 return 1;
1495 }
1496
1497 return 0; /* No change */
1498}
1499 914
1500/** 915/**
1501 * Removes the need to replicate the same code for each layer. 916 * Removes the need to replicate the same code for each layer.
1502 * 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
1503 * it was. 918 * it was.
1504 * sl is the socklist this data is going into. 919 * sl is the socklist this data is going into.
1505 * 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
1506 * 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
1507 * entire player object. 922 * entire player object.
1508 * mx and my are map coordinate offsets for map mp
1509 * sx and sy are the offsets into the socket structure that
1510 * holds the old values.
1511 * 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
1512 * 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)
1513 * take. Interesting to note that before this function, the map1 function 925 * take. Interesting to note that before this function, the map1 function
1514 * numbers the spaces differently - I think this was a leftover from 926 * numbers the spaces differently - I think this was a leftover from
1515 * 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
1516 * 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
1517 * actually match. 929 * actually match.
1518 */ 930 */
1519
1520static int 931static int
1521update_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)
1522{ 933{
1523 object *ob, *head; 934 object *ob = ms.faces_obj [layer];
1524 uint16 face_num;
1525 int bx, by, i;
1526
1527 /* If there is a multipart object stored away, treat that as more important.
1528 * If not, then do the normal processing.
1529 */
1530 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1531
1532 /* Check to see if this head is part of the set of objects
1533 * we would normally send for this space. If so, then
1534 * don't use the head value. We need to do the check
1535 * here and not when setting up the heads[] value for two reasons -
1536 * 1) the heads[] values will get used even if the space is not visible.
1537 * 2) its possible the head is not on the same map as a part, and I'd
1538 * rather not need to do the map translation overhead.
1539 * 3) We need to do some extra checking to make sure that we will
1540 * otherwise send the image as this layer, eg, either it matches
1541 * the head value, or is not multipart.
1542 */
1543 if (head && !head->more)
1544 {
1545 for (i = 0; i < MAP_LAYERS; i++)
1546 {
1547 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1548 if (!ob)
1549 continue;
1550
1551 if (ob->head)
1552 ob = ob->head;
1553
1554 if (ob == head)
1555 {
1556 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1557 head = NULL;
1558 break;
1559 }
1560 }
1561 }
1562
1563 ob = head;
1564 if (!ob)
1565 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1566 935
1567 /* 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
1568 * is the blank face, set the face number to zero. 937 * is the blank face, set the face number to zero.
1569 * 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
1570 * precedence over the other object for this space. 939 * precedence over the other object for this space.
1571 * otherwise, we do special head processing 940 * otherwise, we do special head processing
1572 */ 941 */
1573 if (!ob || ob->face == blank_face) 942 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1574 face_num = 0;
1575 else if (head)
1576 {
1577 /* if this is a head that had previously been stored */
1578 face_num = ob->face->number;
1579 }
1580 else
1581 {
1582 /* if the faces for the different parts of a multipart object
1583 * are the same, we only want to send the bottom right most
1584 * portion of the object. That info is in the tail_.. values
1585 * of the head. Note that for the head itself, ob->head will
1586 * be null, so we only do this block if we are working on
1587 * a tail piece.
1588 */
1589
1590 /* tail_x and tail_y will only be set in the head object. If
1591 * this is the head object and these are set, we proceed
1592 * with logic to only send bottom right. Similarly, if
1593 * this is one of the more parts but the head has those values
1594 * set, we want to do the processing. There can be cases where
1595 * the head is not visible but one of its parts is, so we just
1596 * can always expect that ob->arch->tail_x will be true for all
1597 * object we may want to display.
1598 */
1599 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1600 {
1601
1602 if (ob->head)
1603 head = ob->head;
1604 else
1605 head = ob;
1606
1607 /* Basically figure out where the offset is from where we are right
1608 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1609 * piece is from the head, and the tail is where the tail is from the
1610 * head. Note that bx and by will equal sx and sy if we are already working
1611 * on the bottom right corner. If ob is the head, the clone values
1612 * will be zero, so the right thing will still happen.
1613 */
1614 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1615 by = sy + head->arch->tail_y - ob->arch->clone.y;
1616
1617 /* I don't think this can ever happen, but better to check for it just
1618 * in case.
1619 */
1620 if (bx < sx || by < sy)
1621 {
1622 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1623 face_num = 0;
1624 }
1625 /* single part object, multipart object with non merged faces,
1626 * of multipart object already at lower right.
1627 */
1628 else if (bx == sx && by == sy)
1629 {
1630 face_num = ob->face->number;
1631
1632 /* if this face matches one stored away, clear that one away.
1633 * this code relies on the fact that the map1 commands
1634 * goes from 2 down to 0.
1635 */
1636 for (i = 0; i < MAP_LAYERS; i++)
1637 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1638 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1639 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1640 }
1641 else
1642 {
1643 /* If this head is stored away, clear it - otherwise,
1644 * there can be cases where a object is on multiple layers -
1645 * we only want to send it once.
1646 */
1647 face_num = head->face->number;
1648 for (i = 0; i < MAP_LAYERS; i++)
1649 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1650 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1651 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1652
1653 /* First, try to put the new head on the same layer. If that is used up,
1654 * then find another layer.
1655 */
1656 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1657 {
1658 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1659 }
1660 else
1661 for (i = 0; i < MAX_LAYERS; i++)
1662 {
1663 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1664 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1665 {
1666 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1667 }
1668 }
1669 face_num = 0; /* Don't send this object - we'll send the head later */
1670 }
1671 }
1672 else
1673 {
1674 /* In this case, we are already at the lower right or single part object,
1675 * so nothing special
1676 */
1677 face_num = ob->face->number;
1678
1679 /* clear out any head entries that have the same face as this one */
1680 for (bx = 0; bx < layer; bx++)
1681 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1682 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1683 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1684 }
1685 } /* else not already head object or blank face */
1686
1687 /* This is a real hack. Basically, if we have nothing to send for this layer,
1688 * but there is a head on the next layer, send that instead.
1689 * Without this, what happens is you can get the case where the player stands
1690 * on the same space as the head. However, if you have overlapping big objects
1691 * of the same type, what happens then is it doesn't think it needs to send
1692 * This tends to make stacking also work/look better.
1693 */
1694 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1695 {
1696 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1697 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1698 }
1699
1700 /* Another hack - because of heads and whatnot, this face may match one
1701 * we already sent for a lower layer. In that case, don't send
1702 * this one.
1703 */
1704 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1705 face_num = 0;
1706 943
1707 /* 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
1708 * 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.
1709 */ 946 */
1710 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 947 if (lastcell.faces[layer] != face_num)
1711 { 948 {
1712 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 949 lastcell.faces[layer] = face_num;
950
1713 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 951 if (!ns.faces_sent[face_num])
952 if (ob)
953 ns.send_faces (ob);
954 else
1714 esrv_send_face (&ns, face_num, 0); 955 ns.send_face (face_num);
1715 956
1716 sl << uint16 (face_num); 957 sl << uint16 (face_num);
1717 return 1;
1718 }
1719
1720 /* Nothing changed */
1721 return 0;
1722}
1723
1724/**
1725 * This function is mainly a copy of update_space,
1726 * except it handles update of the smoothing updates,
1727 * not the face updates.
1728 * Removes the need to replicate the same code for each layer.
1729 * this returns true if this smooth is now in fact different
1730 * than it was.
1731 * sl is the socklist this data is going into.
1732 * ns is the socket we are working on - all the info we care
1733 * about is in this socket structure, so know need to pass the
1734 * entire player object.
1735 * mx and my are map coordinate offsets for map mp
1736 * sx and sy are the offsets into the socket structure that
1737 * holds the old values.
1738 * layer is the layer to update, with 2 being the floor and 0 the
1739 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1740 * take.
1741 */
1742
1743static inline int
1744update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1745{
1746 object *ob;
1747 int smoothlevel; /* old face_num; */
1748
1749 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1750
1751 /* If there is no object for this space, or if the face for the object
1752 * is the blank face, set the smoothlevel to zero.
1753 */
1754 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1755 smoothlevel = 0;
1756 else
1757 {
1758 smoothlevel = ob->smoothlevel;
1759 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1760 SendSmooth (&ns, ob->face->number);
1761 } /* else not already head object or blank face */
1762
1763 /* We've gotten what face we want to use for the object. Now see if
1764 * if it has changed since we last sent it to the client.
1765 */
1766 if (smoothlevel > 255)
1767 smoothlevel = 255;
1768 else if (smoothlevel < 0)
1769 smoothlevel = 0;
1770
1771 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1772 {
1773 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1774 sl << uint8 (smoothlevel);
1775 return 1; 958 return 1;
1776 } 959 }
1777 960
1778 /* Nothing changed */ 961 /* Nothing changed */
1779 return 0; 962 return 0;
… …
1783 * 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
1784 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 967 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1785 * available. 968 * available.
1786 */ 969 */
1787int 970int
1788getExtendedMapInfoSize (NewSocket * ns) 971getExtendedMapInfoSize (client * ns)
1789{ 972{
1790 int result = 0; 973 int result = 0;
1791 974
1792 if (ns->ext_mapinfos) 975 if (ns->ext_mapinfos)
1793 { 976 {
1794 if (ns->EMI_smooth) 977 if (ns->EMI_smooth)
1795 result += 1; /*One byte for smoothlevel */ 978 result += 1; /*One byte for smoothlevel */
1796 } 979 }
980
1797 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);
1798} 1004}
1799 1005
1800/** 1006/**
1801 * 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
1802 * 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
… …
1808 * 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
1809 * 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,
1810 * 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
1811 * of what we send, see the doc/Protocol file. 1017 * of what we send, see the doc/Protocol file.
1812 * I will describe internally what we do: 1018 * I will describe internally what we do:
1813 * 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.
1814 * 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
1815 * maximum viewable size (As set in config.h). 1021 * maximum viewable size (As set in config.h).
1816 * in the cells, there are faces and a count value. 1022 * in the cells, there are faces and a count value.
1817 * 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
1818 * is not viewable. 1024 * is not viewable.
… …
1820 * look like. 1026 * look like.
1821 */ 1027 */
1822void 1028void
1823draw_client_map1 (object *pl) 1029draw_client_map1 (object *pl)
1824{ 1030{
1825 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1826 sint16 nx, ny; 1032 sint16 nx, ny;
1827 int estartlen, eoldlen; 1033 int estartlen, eoldlen;
1828 uint16 mask, emask;
1829 uint8 eentrysize; 1034 uint8 eentrysize;
1830 uint16 ewhatstart, ewhatflag; 1035 uint16 ewhatstart, ewhatflag;
1831 uint8 extendedinfos; 1036 uint8 extendedinfos;
1832 maptile *m; 1037 maptile *m;
1833 1038
1834 NewSocket &socket = pl->contr->socket; 1039 client &socket = *pl->contr->ns;
1040
1041 if (!pl->active)
1042 return;
1835 1043
1836 check_map_change (pl->contr); 1044 check_map_change (pl->contr);
1045 prefetch_surrounding_maps (pl);
1837 1046
1838 SockList sl (MAXSOCKBUF);
1839 SockList esl (MAXSOCKBUF);
1840
1841 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1047 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1048 packet esl;
1049
1842 startlen = sl.len; 1050 startlen = sl.length ();
1843 1051
1844 /*Extendedmapinfo structure initialisation */ 1052 /*Extendedmapinfo structure initialisation */
1845 if (socket.ext_mapinfos) 1053 if (socket.ext_mapinfos)
1846 { 1054 {
1847 extendedinfos = EMI_NOREDRAW; 1055 extendedinfos = EMI_NOREDRAW;
1848 1056
1849 if (socket.EMI_smooth) 1057 if (socket.EMI_smooth)
1850 extendedinfos |= EMI_SMOOTH; 1058 extendedinfos |= EMI_SMOOTH;
1851 1059
1852 ewhatstart = esl.len; 1060 ewhatstart = esl.length ();
1853 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1061 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1854 could need to be taken away */ 1062 could need to be taken away */
1855 eentrysize = getExtendedMapInfoSize (&socket); 1063 eentrysize = getExtendedMapInfoSize (&socket);
1856 esl << "mapextended " 1064 esl << "mapextended "
1857 << uint8 (extendedinfos) 1065 << uint8 (extendedinfos)
1858 << uint8 (eentrysize); 1066 << uint8 (eentrysize);
1067
1859 estartlen = esl.len; 1068 estartlen = esl.length ();
1860 }
1861 else
1862 { 1069 }
1863 /* suppress compiler warnings */
1864 ewhatstart = 0;
1865 ewhatflag = 0;
1866 estartlen = 0;
1867 }
1868
1869 /* Init data to zero */
1870 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1871 1070
1872 /* 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
1873 * locations. 1072 * locations.
1874 */ 1073 */
1875 ay = 0; 1074 ay = 0;
… …
1878 * but that started to get a bit messy to look at. 1077 * but that started to get a bit messy to look at.
1879 */ 1078 */
1880 max_x = pl->x + (socket.mapx + 1) / 2; 1079 max_x = pl->x + (socket.mapx + 1) / 2;
1881 max_y = pl->y + (socket.mapy + 1) / 2; 1080 max_y = pl->y + (socket.mapy + 1) / 2;
1882 1081
1883 if (socket.mapmode == Map1aCmd) 1082 maptile *plmap = pl->map;
1884 {
1885 max_x += MAX_HEAD_OFFSET;
1886 max_y += MAX_HEAD_OFFSET;
1887 }
1888 1083
1889 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++)
1890 { 1085 {
1891 ax = 0; 1086 ax = 0;
1892 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++)
1893 { 1088 {
1894 1089 int emask, mask;
1895 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1090 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1896 1091
1897 /* If this space is out of the normal viewable area, we only check
1898 * the heads value ax or ay will only be greater than what
1899 * the client wants if using the map1a command - this is because
1900 * if the map1a command is not used, max_x and max_y will be
1901 * set to lower values.
1902 */
1903 if (ax >= socket.mapx || ay >= socket.mapy)
1904 {
1905 int i, got_one;
1906
1907 oldlen = sl.len;
1908
1909 sl << uint16 (mask);
1910
1911 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1912 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1913 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1914
1915 /* If all we are doing is sending 0 (blank) faces, we don't
1916 * actually need to send that - just the coordinates
1917 * with no faces tells the client to blank out the
1918 * space.
1919 */
1920 got_one = 0;
1921 for (i = oldlen + 2; i < sl.len; i++)
1922 if (sl.buf[i])
1923 got_one = 1;
1924
1925 if (got_one && (mask & 0xf))
1926 sl.buf[oldlen + 1] = mask & 0xff;
1927 else
1928 { /*either all faces blank, either no face at all */
1929 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1930 sl.len = oldlen + 2;
1931 else
1932 sl.len = oldlen;
1933 }
1934
1935 /*What concerns extendinfos, nothing to be done for now
1936 * (perhaps effects layer later)
1937 */
1938 continue; /* don't do processing below */
1939 }
1940
1941 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1092 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1942
1943 d = pl->contr->blocked_los[ax][ay];
1944 1093
1945 /* 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,
1946 * we tell the client as such 1095 * we tell the client as such
1947 */ 1096 */
1948 nx = x; 1097 nx = x;
1949 ny = y; 1098 ny = y;
1950 m = get_map_from_coord (pl->map, &nx, &ny); 1099 m = get_map_from_coord (plmap, &nx, &ny);
1951 1100
1952 if (!m) 1101 if (!m)
1953 { 1102 {
1954 /* space is out of map. Update space and clear values 1103 /* space is out of map. Update space and clear values
1955 * 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
1956 * of the map, it shouldn't have a head 1105 * of the map, it shouldn't have a head
1957 */ 1106 */
1958 if (lastcell.count != -1) 1107 if (lastcell.count != -1)
1959 { 1108 {
1960 sl << uint16 (mask); 1109 sl << uint16 (mask);
1961 map_clearcell (&lastcell, 0, 0, 0, -1); 1110 map_clearcell (&lastcell, -1);
1962 } 1111 }
1112
1113 continue;
1963 } 1114 }
1115
1116 m->touch ();
1117
1118 int d = pl->contr->blocked_los[ax][ay];
1119
1964 else if (d > 3) 1120 if (d > 3)
1965 { 1121 {
1122
1966 int need_send = 0, count; 1123 int need_send = 0, count;
1967 1124
1968 /* This block deals with spaces that are not visible for whatever 1125 /* This block deals with spaces that are not visible for whatever
1969 * reason. Still may need to send the head for this space. 1126 * reason. Still may need to send the head for this space.
1970 */ 1127 */
1971 1128
1972 oldlen = sl.len; 1129 oldlen = sl.length ();
1973 1130
1974 sl << uint16 (mask); 1131 sl << uint16 (mask);
1975 1132
1976 if (lastcell.count != -1) 1133 if (lastcell.count != -1)
1977 need_send = 1; 1134 need_send = 1;
1978 1135
1979 count = -1; 1136 count = -1;
1980 1137
1981 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1138 /* properly clear a previously sent big face */
1982 { 1139 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1983 /* Now check to see if any heads need to be sent */ 1140 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1141 need_send = 1;
1984 1142
1985 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1143 map_clearcell (&lastcell, count);
1986 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1987 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1988 1144
1989 lastcell.count = count; 1145 if ((mask & 0xf) || need_send)
1990 } 1146 sl[oldlen + 1] = mask & 0xff;
1991 else 1147 else
1992 {
1993 /* properly clear a previously sent big face */
1994 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1995 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1996 need_send = 1;
1997
1998 map_clearcell (&lastcell, 0, 0, 0, count);
1999 }
2000
2001 if ((mask & 0xf) || need_send)
2002 sl.buf[oldlen + 1] = mask & 0xff;
2003 else
2004 sl.len = oldlen; 1148 sl.reset (oldlen);
2005 } 1149 }
2006 else 1150 else
2007 { 1151 {
2008 /* In this block, the space is visible or there are head objects 1152 /* In this block, the space is visible.
2009 * we need to send.
2010 */ 1153 */
2011 1154
2012 /* Rather than try to figure out what everything that we might 1155 /* Rather than try to figure out what everything that we might
2013 * need to send is, then form the packet after that, 1156 * need to send is, then form the packet after that,
2014 * 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
2015 * 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,
2016 * 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
2017 * is done. 1160 * is done.
2018 * 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
2019 * what if anything we need to send, setting the bits, then 1162 * what if anything we need to send, setting the bits, then
2020 * doing those checks again to add the real data. 1163 * doing those checks again to add the real data.
2021 */ 1164 */
2022 oldlen = sl.len; 1165 oldlen = sl.length ();
2023 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2024 eoldlen = esl.len; 1166 eoldlen = esl.length ();
2025 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1167
2026 sl << uint16 (mask); 1168 sl << uint16 (mask);
2027
2028 if (socket.ext_mapinfos)
2029 esl << uint16 (emask);
2030 1169
2031 unsigned char dummy; 1170 unsigned char dummy;
2032 unsigned char *last_ext = &dummy; 1171 unsigned char *last_ext = &dummy;
2033 1172
2034 /* Darkness changed */ 1173 /* Darkness changed */
… …
2037 mask |= 0x8; 1176 mask |= 0x8;
2038 1177
2039 if (socket.extmap) 1178 if (socket.extmap)
2040 { 1179 {
2041 *last_ext |= 0x80; 1180 *last_ext |= 0x80;
2042 last_ext = sl.buf + sl.len; 1181 last_ext = &sl[sl.length ()];
2043 sl << uint8 (d); 1182 sl << uint8 (d);
2044 } 1183 }
2045 else 1184 else
2046 sl << uint8 (255 - 64 * d); 1185 sl << uint8 (255 - 64 * d);
2047 } 1186 }
2048 1187
2049 lastcell.count = d; 1188 lastcell.count = d;
1189
1190 mapspace &ms = m->at (nx, ny);
2050 1191
2051 if (socket.extmap) 1192 if (socket.extmap)
2052 { 1193 {
2053 uint8 stat_hp = 0; 1194 uint8 stat_hp = 0;
2054 uint8 stat_width = 0; 1195 uint8 stat_width = 0;
2055 uint8 flags = 0; 1196 uint8 flags = 0;
2056 UUID player = 0; 1197 UUID player = 0;
2057 1198
2058 // send hp information, if applicable 1199 // send hp information, if applicable
2059 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1200 if (object *op = ms.faces_obj [0])
2060 { 1201 {
2061 if (op->head || op->invisible) 1202 if (op->head || op->invisible)
2062 ; // do not show 1203 ; // do not show
2063 else if (op->type == PLAYER 1204 else if (op->type == PLAYER
2064 || 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))
… …
2081 { 1222 {
2082 lastcell.stat_hp = stat_hp; 1223 lastcell.stat_hp = stat_hp;
2083 1224
2084 mask |= 0x8; 1225 mask |= 0x8;
2085 *last_ext |= 0x80; 1226 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 1227 last_ext = &sl[sl.length ()];
2087 1228
2088 sl << uint8 (5) << uint8 (stat_hp); 1229 sl << uint8 (5) << uint8 (stat_hp);
2089 1230
2090 if (stat_width > 1) 1231 if (stat_width > 1)
2091 { 1232 {
2092 *last_ext |= 0x80; 1233 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 1234 last_ext = &sl[sl.length ()];
2094 1235
2095 sl << uint8 (6) << uint8 (stat_width); 1236 sl << uint8 (6) << uint8 (stat_width);
2096 } 1237 }
2097 } 1238 }
2098 1239
… …
2100 { 1241 {
2101 lastcell.player = player; 1242 lastcell.player = player;
2102 1243
2103 mask |= 0x8; 1244 mask |= 0x8;
2104 *last_ext |= 0x80; 1245 *last_ext |= 0x80;
2105 last_ext = sl.buf + sl.len; 1246 last_ext = &sl[sl.length ()];
2106 1247
2107 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1248 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2108 } 1249 }
2109 1250
2110 if (lastcell.flags != flags) 1251 if (lastcell.flags != flags)
2111 { 1252 {
2112 lastcell.flags = flags; 1253 lastcell.flags = flags;
2113 1254
2114 mask |= 0x8; 1255 mask |= 0x8;
2115 *last_ext |= 0x80; 1256 *last_ext |= 0x80;
2116 last_ext = sl.buf + sl.len; 1257 last_ext = &sl[sl.length ()];
2117 1258
2118 sl << uint8 (8) << uint8 (flags); 1259 sl << uint8 (8) << uint8 (flags);
2119 } 1260 }
2120 } 1261 }
2121 1262
2122 /* Floor face */ 1263 /* Floor face */
2123 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1264 if (update_space (sl, socket, ms, lastcell, 2))
2124 mask |= 0x4; 1265 mask |= 0x4;
2125 1266
2126 if (socket.EMI_smooth)
2127 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2128 emask |= 0x4;
2129
2130 /* Middle face */ 1267 /* Middle face */
2131 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1268 if (update_space (sl, socket, ms, lastcell, 1))
2132 mask |= 0x2; 1269 mask |= 0x2;
2133 1270
2134 if (socket.EMI_smooth) 1271 if (ms.player () == pl
2135 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1272 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
2136 emask |= 0x2;
2137
2138 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2139 { 1273 {
1274 // force player to be visible to himself if invisible
2140 if (lastcell.faces[0] != pl->face->number) 1275 if (lastcell.faces[0] != pl->face)
2141 { 1276 {
2142 lastcell.faces[0] = pl->face->number; 1277 lastcell.faces[0] = pl->face;
1278
2143 mask |= 0x1; 1279 mask |= 0x1;
2144
2145 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2146 esrv_send_face (&socket, pl->face->number, 0);
2147
2148 sl << uint16 (pl->face->number); 1280 sl << uint16 (pl->face);
1281
1282 socket.send_faces (pl);
2149 } 1283 }
2150 } 1284 }
2151 else
2152 {
2153 /* Top face */ 1285 /* Top face */
2154 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1286 else if (update_space (sl, socket, ms, lastcell, 0))
2155 mask |= 0x1; 1287 mask |= 0x1;
2156
2157 if (socket.EMI_smooth)
2158 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2159 emask |= 0x1;
2160 } 1288
2161 1289
2162 /* 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
2163 * space by checking the mask. If so, update the mask. 1291 * space by checking the mask. If so, update the mask.
2164 * 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
2165 * value, so we don't send those bits. 1293 * value, so we don't send those bits.
2166 */ 1294 */
2167 if (mask & 0xf) 1295 if (mask & 0xf)
2168 sl.buf[oldlen + 1] = mask & 0xff; 1296 sl[oldlen + 1] = mask & 0xff;
2169 else 1297 else
2170 sl.len = oldlen; 1298 sl.reset (oldlen);
2171 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
2172 if (emask & 0xf) 1323 if (emask & 0xf)
2173 esl.buf[eoldlen + 1] = emask & 0xff; 1324 esl[eoldlen + 1] = emask & 0xff;
2174 else 1325 else
2175 esl.len = eoldlen; 1326 esl.reset (eoldlen);
1327 }
2176 } /* else this is a viewable space */ 1328 } /* else this is a viewable space */
2177 } /* for x loop */ 1329 } /* for x loop */
2178 } /* for y loop */ 1330 } /* for y loop */
2179 1331
2180 /* Verify that we in fact do need to send this */ 1332 /* Verify that we in fact do need to send this */
2181 if (socket.ext_mapinfos) 1333 if (socket.ext_mapinfos)
2182 { 1334 {
2183 if (!(sl.len > startlen || socket.sent_scroll)) 1335 if (!(sl.length () > startlen || socket.sent_scroll))
2184 { 1336 {
2185 /* No map data will follow, so don't say the client 1337 /* No map data will follow, so don't say the client
2186 * it doesn't need draw! 1338 * it doesn't need draw!
2187 */ 1339 */
2188 ewhatflag &= (~EMI_NOREDRAW); 1340 ewhatflag &= ~EMI_NOREDRAW;
2189 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1341 esl[ewhatstart + 1] = ewhatflag & 0xff;
2190 } 1342 }
2191 1343
2192 if (esl.len > estartlen) 1344 if (esl.length () > estartlen)
2193 Send_With_Handling (&socket, &esl); 1345 socket.send_packet (esl);
2194 } 1346 }
2195 1347
2196 if (sl.len > startlen || socket.sent_scroll) 1348 if (sl.length () > startlen || socket.sent_scroll)
2197 { 1349 {
2198 Send_With_Handling (&socket, &sl); 1350 socket.send_packet (sl);
2199 socket.sent_scroll = 0; 1351 socket.sent_scroll = 0;
2200 } 1352 }
2201
2202 sl.free ();
2203 esl.free ();
2204} 1353}
2205 1354
2206/** 1355/**
2207 * Draws client map. 1356 * Draws client map.
2208 */ 1357 */
2209void 1358void
2210draw_client_map (object *pl) 1359draw_client_map (object *pl)
2211{ 1360{
2212 int i, j; 1361 int i, j;
2213 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 */
2214 New_Face *face, *floor;
2215 New_Face *floor2;
2216 int d, mflags; 1363 int mflags;
2217 struct Map newmap; 1364 struct Map newmap;
2218 maptile *m, *pm; 1365 maptile *m, *pm;
2219 1366
2220 if (pl->type != PLAYER) 1367 if (pl->type != PLAYER)
2221 { 1368 {
… …
2232 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1379 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2233 return; 1380 return;
2234 1381
2235 memset (&newmap, 0, sizeof (struct Map)); 1382 memset (&newmap, 0, sizeof (struct Map));
2236 1383
2237 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++)
2238 {
2239 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++)
2240 { 1386 {
2241 ax = i; 1387 ax = i;
2242 ay = j; 1388 ay = j;
2243 m = pm; 1389 m = pm;
2244 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1390 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1391
2245 if (mflags & P_OUT_OF_MAP) 1392 if (mflags & P_OUT_OF_MAP)
2246 continue; 1393 continue;
2247 if (mflags & P_NEED_UPDATE) 1394
2248 update_position (m, ax, ay);
2249 /* 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
2250 * just to reload it. This should really call something like 1396 * just to reload it. This should really call something like
2251 * swap_map, but this is much more efficient and 'good enough' 1397 * swap_map, but this is much more efficient and 'good enough'
2252 */ 1398 */
2253 if (mflags & P_NEW_MAP) 1399 if (mflags & P_NEW_MAP)
2254 m->timeout = 50; 1400 m->timeout = 50;
2255 } 1401 }
2256 } 1402
2257 /* do LOS after calls to update_position */ 1403 /* do LOS after calls to update_position */
2258 if (pl->contr->do_los) 1404 if (pl->contr->do_los)
2259 { 1405 {
2260 update_los (pl); 1406 update_los (pl);
2261 pl->contr->do_los = 0; 1407 pl->contr->do_los = 0;
2262 } 1408 }
2263 1409
2264 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2265 {
2266 /* Big maps need a different drawing mechanism to work */ 1410 /* Big maps need a different drawing mechanism to work */
2267 draw_client_map1 (pl); 1411 draw_client_map1 (pl);
2268 return;
2269 }
2270
2271 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2272 {
2273 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2274 }
2275
2276 /* j and i are the y and x coordinates of the real map (which is
2277 * basically some number of spaces around the player)
2278 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2279 * left corner) and are thus disconnected from the map values.
2280 * Subtract 1 from the max values so that we properly handle cases where
2281 * player has specified an even map. Otherwise, we try to send them too
2282 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2283 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2284 * odd, this still works fine.
2285 */
2286 ay = 0;
2287 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2288 {
2289 ax = 0;
2290 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2291 {
2292
2293 d = pl->contr->blocked_los[ax][ay];
2294 /* note the out_of_map and d>3 checks are both within the same
2295 * negation check.
2296 */
2297 nx = i;
2298 ny = j;
2299 m = get_map_from_coord (pm, &nx, &ny);
2300 if (m && d < 4)
2301 {
2302 face = GET_MAP_FACE (m, nx, ny, 0);
2303 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2304 floor = GET_MAP_FACE (m, nx, ny, 2);
2305
2306 /* If all is blank, send a blank face. */
2307 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2308 {
2309 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2310 }
2311 else
2312 { /* actually have something interesting */
2313 /* send the darkness mask, if any. */
2314 if (d && pl->contr->socket.darkness)
2315 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2316
2317 if (face && face != blank_face)
2318 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2319 if (floor2 && floor2 != blank_face)
2320 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2321 if (floor && floor != blank_face)
2322 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2323 }
2324 } /* Is a valid space */
2325 }
2326 }
2327
2328 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2329
2330 check_map_change (pl->contr);
2331} 1412}
2332 1413
2333 1414
2334/*****************************************************************************/ 1415/*****************************************************************************/
2335 1416
… …
2341 1422
2342/*****************************************************************************/ 1423/*****************************************************************************/
2343void 1424void
2344send_plugin_custom_message (object *pl, char *buf) 1425send_plugin_custom_message (object *pl, char *buf)
2345{ 1426{
2346 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 1427 pl->contr->ns->send_packet (buf);
2347} 1428}
2348 1429
2349/** 1430/**
2350 * This sends the skill number to name mapping. We ignore 1431 * This sends the skill number to name mapping. We ignore
2351 * the params - we always send the same info no matter what. 1432 * the params - we always send the same info no matter what.
2352 */ 1433 */
2353void 1434void
2354send_skill_info (NewSocket *ns, char *params) 1435send_skill_info (client *ns, char *params)
2355{ 1436{
2356 SockList sl (MAXSOCKBUF); 1437 packet sl;
2357 sl << "replyinfo skill_info\n"; 1438 sl << "replyinfo skill_info\n";
2358 1439
2359 for (int i = 1; i < NUM_SKILLS; i++) 1440 for (int i = 1; i < NUM_SKILLS; i++)
2360 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1441 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2361 1442
2362 if (sl.len >= MAXSOCKBUF) 1443 if (sl.length () >= MAXSOCKBUF)
2363 { 1444 {
2364 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1445 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2365 fatal (0); 1446 fatal (0);
2366 } 1447 }
2367 1448
2368 Send_With_Handling (ns, &sl); 1449 ns->send_packet (sl);
2369 sl.free ();
2370} 1450}
2371 1451
2372/** 1452/**
2373 * This sends the spell path to name mapping. We ignore 1453 * This sends the spell path to name mapping. We ignore
2374 * the params - we always send the same info no matter what. 1454 * the params - we always send the same info no matter what.
2375 */ 1455 */
2376void 1456void
2377send_spell_paths (NewSocket * ns, char *params) 1457send_spell_paths (client * ns, char *params)
2378{ 1458{
2379 SockList sl (MAXSOCKBUF); 1459 packet sl;
2380 1460
2381 sl << "replyinfo spell_paths\n"; 1461 sl << "replyinfo spell_paths\n";
2382 1462
2383 for (int i = 0; i < NRSPELLPATHS; i++) 1463 for (int i = 0; i < NRSPELLPATHS; i++)
2384 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1464 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2385 1465
2386 if (sl.len >= MAXSOCKBUF) 1466 if (sl.length () >= MAXSOCKBUF)
2387 { 1467 {
2388 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1468 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2389 fatal (0); 1469 fatal (0);
2390 } 1470 }
2391 1471
2392 Send_With_Handling (ns, &sl); 1472 ns->send_packet (sl);
2393 sl.free ();
2394} 1473}
2395 1474
2396/** 1475/**
2397 * 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.
2398 * 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
2399 */ 1478 */
2400void 1479void
2401esrv_update_spells (player *pl) 1480esrv_update_spells (player *pl)
2402{ 1481{
1482 if (!pl->ns)
1483 return;
1484
2403 if (!pl->socket.monitor_spells) 1485 if (!pl->ns->monitor_spells)
2404 return; 1486 return;
2405 1487
2406 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1488 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2407 { 1489 {
2408 if (spell->type == SPELL) 1490 if (spell->type == SPELL)
… …
2428 flags |= UPD_SP_DAMAGE; 1510 flags |= UPD_SP_DAMAGE;
2429 } 1511 }
2430 1512
2431 if (flags) 1513 if (flags)
2432 { 1514 {
2433 SockList sl (MAXSOCKBUF); 1515 packet sl;
2434 1516
2435 sl << "updspell " 1517 sl << "updspell "
2436 << uint8 (flags) 1518 << uint8 (flags)
2437 << uint32 (spell->count); 1519 << uint32 (spell->count);
2438 1520
2439 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1521 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2440 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1522 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2441 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1523 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2442 1524
2443 Send_With_Handling (&pl->socket, &sl); 1525 pl->ns->send_packet (sl);
2444 sl.free ();
2445 } 1526 }
2446 } 1527 }
2447 } 1528 }
2448} 1529}
2449 1530
2450void 1531void
2451esrv_remove_spell (player *pl, object *spell) 1532esrv_remove_spell (player *pl, object *spell)
2452{ 1533{
2453 if (!pl->socket.monitor_spells) 1534 if (!pl->ns->monitor_spells)
2454 return; 1535 return;
2455 1536
2456 if (!pl || !spell || spell->env != pl->ob) 1537 if (!pl || !spell || spell->env != pl->ob)
2457 { 1538 {
2458 LOG (llevError, "Invalid call to esrv_remove_spell"); 1539 LOG (llevError, "Invalid call to esrv_remove_spell");
2459 return; 1540 return;
2460 } 1541 }
2461 1542
2462 SockList sl (MAXSOCKBUF); 1543 packet sl ("delspell");
2463 1544
2464 sl << "delspell "
2465 << uint32 (spell->count); 1545 sl << uint32 (spell->count);
2466 1546
2467 Send_With_Handling (&pl->socket, &sl); 1547 pl->ns->send_packet (sl);
2468 sl.free ();
2469} 1548}
2470 1549
2471/* 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. */
2472static void 1551static void
2473append_spell (player *pl, SockList &sl, object *spell) 1552append_spell (player *pl, packet &sl, object *spell)
2474{ 1553{
2475 int len, i, skill = 0; 1554 int i, skill = 0;
2476 1555
2477 if (!(spell->name)) 1556 if (!(spell->name))
2478 { 1557 {
2479 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);
2480 return; 1559 return;
… …
2492 if (!strcmp (spell->skill, skill_names[i])) 1571 if (!strcmp (spell->skill, skill_names[i]))
2493 { 1572 {
2494 skill = i + CS_STAT_SKILLINFO; 1573 skill = i + CS_STAT_SKILLINFO;
2495 break; 1574 break;
2496 } 1575 }
1576 }
1577
1578 // spells better have a face
1579 if (!spell->face)
1580 {
1581 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1582 spell->face = face_find ("burnout.x11", blank_face);
2497 } 1583 }
2498 1584
2499 /* send the current values */ 1585 /* send the current values */
2500 sl << uint32 (spell->count) 1586 sl << uint32 (spell->count)
2501 << uint16 (spell->level) 1587 << uint16 (spell->level)
… …
2503 << uint16 (spell->last_sp) 1589 << uint16 (spell->last_sp)
2504 << uint16 (spell->last_grace) 1590 << uint16 (spell->last_grace)
2505 << uint16 (spell->last_eat) 1591 << uint16 (spell->last_eat)
2506 << uint8 (skill) 1592 << uint8 (skill)
2507 << uint32 (spell->path_attuned) 1593 << uint32 (spell->path_attuned)
2508 << uint32 (spell->face ? spell->face->number : 0) 1594 << uint32 (spell->face)
2509 << data8 (spell->name) 1595 << data8 (spell->name)
2510 << data16 (spell->msg); 1596 << data16 (spell->msg);
2511} 1597}
2512 1598
2513/** 1599/**
… …
2521 { 1607 {
2522 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");
2523 return; 1609 return;
2524 } 1610 }
2525 1611
2526 if (!pl->socket.monitor_spells) 1612 if (!pl->ns->monitor_spells)
2527 return; 1613 return;
2528 1614
2529 SockList sl (MAXSOCKBUF); 1615 packet sl ("addspell");
2530
2531 sl << "addspell ";
2532 1616
2533 if (!spell) 1617 if (!spell)
2534 { 1618 {
2535 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1619 for (spell = pl->ob->inv; spell; spell = spell->below)
2536 { 1620 {
2537 /* were we to simply keep appending data here, we could exceed 1621 /* were we to simply keep appending data here, we could exceed
2538 * 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
2539 * append_spells will always append 19 data bytes, plus 4 length 1623 * append_spells will always append 19 data bytes, plus 4 length
2540 * 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
… …
2548 * like it will fix this 1632 * like it will fix this
2549 */ 1633 */
2550 if (spell->type != SPELL) 1634 if (spell->type != SPELL)
2551 continue; 1635 continue;
2552 1636
2553 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))))
2554 { 1638 {
2555 Send_With_Handling (&pl->socket, &sl); 1639 pl->ns->send_packet (sl);
2556 strcpy ((char *) sl.buf, "addspell "); 1640
2557 sl.len = strlen ((char *) sl.buf); 1641 sl.reset ();
1642 sl << "addspell ";
2558 } 1643 }
2559 1644
2560 append_spell (pl, sl, spell); 1645 append_spell (pl, sl, spell);
2561 } 1646 }
2562 } 1647 }
… …
2573 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1658 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2574 fatal (0); 1659 fatal (0);
2575 } 1660 }
2576 1661
2577 /* finally, we can send the packet */ 1662 /* finally, we can send the packet */
2578 Send_With_Handling (&pl->socket, &sl); 1663 pl->ns->send_packet (sl);
2579
2580 sl.free ();
2581} 1664}
2582 1665

Diff Legend

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