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.16 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.48 by root, Wed Dec 20 11:36:39 2006 UTC

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

Diff Legend

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