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

Diff Legend

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