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

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

Diff Legend

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