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.36 by root, Thu Dec 14 04:30:33 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.
… …
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 43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
50 * operations 44 * operations
51 * 45 *
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 */ 46 */
58 47
59#include <global.h> 48#include <global.h>
60#include <sproto.h> 49#include <sproto.h>
61 50
… …
65#include <commands.h> 54#include <commands.h>
66 55
67/* This block is basically taken from socket.c - I assume if it works there, 56/* This block is basically taken from socket.c - I assume if it works there,
68 * it should work here. 57 * it should work here.
69 */ 58 */
70#ifndef WIN32 /* ---win32 exclude unix headers */
71# include <sys/types.h> 59#include <sys/types.h>
72# include <sys/time.h> 60#include <sys/time.h>
73# include <sys/socket.h> 61#include <sys/socket.h>
74# include <netinet/in.h> 62#include <netinet/in.h>
75# include <netdb.h> 63#include <netdb.h>
76#endif /* win32 */
77 64
78#ifdef HAVE_UNISTD_H 65#ifdef HAVE_UNISTD_H
79# include <unistd.h> 66# include <unistd.h>
80#endif 67#endif
81 68
… …
106 -1, /* life stealing */ 93 -1, /* life stealing */
107 -1 /* Disease - not fully done yet */ 94 -1 /* Disease - not fully done yet */
108}; 95};
109 96
110static void 97static void
111socket_map_scroll (NewSocket * ns, int dx, int dy) 98socket_map_scroll (client_socket * ns, int dx, int dy)
112{ 99{
113 struct Map newmap; 100 struct Map newmap;
114 int x, y, mx, my; 101 int x, y, mx, my;
115 102
116 { 103 {
117 char buf[MAXSOCKBUF]; 104 packet sl;
118 105
119 sprintf (buf, "map_scroll %d %d", dx, dy); 106 sl.printf ("map_scroll %d %d", dx, dy);
120 Write_String_To_Socket (ns, buf, strlen (buf)); 107 ns->send_packet (sl);
121 } 108 }
122 109
123 /* If we are using the Map1aCmd, we may in fact send 110 /* If we are using the Map1aCmd, we may in fact send
124 * head information that is outside the viewable map. 111 * head information that is outside the viewable map.
125 * So set the mx,my to the max value we want to 112 * So set the mx,my to the max value we want to
… …
145 for (x = 0; x < mx; x++) 132 for (x = 0; x < mx; x++)
146 { 133 {
147 for (y = 0; y < my; y++) 134 for (y = 0; y < my; y++)
148 { 135 {
149 if (x >= ns->mapx || y >= ns->mapy) 136 if (x >= ns->mapx || y >= ns->mapy)
150 {
151 /* clear cells outside the viewable area */ 137 /* clear cells outside the viewable area */
152 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 138 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) 139 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 */ 140 /* clear newly visible tiles within the viewable area */
157 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 141 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
158 }
159 else 142 else
160 {
161 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 143 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
162 }
163 } 144 }
164 } 145 }
165 146
166 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 147 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
167 148
… …
172} 153}
173 154
174static void 155static void
175clear_map (player *pl) 156clear_map (player *pl)
176{ 157{
177 NewSocket & socket = pl->socket; 158 client_socket &socket = *pl->socket;
178 159
179 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 160 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
180 161
181 if (socket.newmapcmd == 1) 162 if (socket.newmapcmd == 1)
182 Write_String_To_Socket (&socket, "newmap", 6); 163 socket.send_packet ("newmap");
183 164
184 socket.update_look = 1; 165 socket.update_look = 1;
185 socket.look_position = 0; 166 socket.look_position = 0;
186} 167}
187 168
188/** check for map change and send new map data */ 169/** check for map change and send new map data */
189static void 170static void
190check_map_change (player *pl) 171check_map_change (player *pl)
191{ 172{
192 NewSocket & socket = pl->socket; 173 client_socket &socket = *pl->socket;
193 object *ob = pl->ob; 174 object *ob = pl->ob;
194 char buf[MAX_BUF]; /* eauugggh */ 175 char buf[MAX_BUF]; /* eauugggh */
195 176
196 if (socket.current_map != ob->map) 177 if (socket.current_map != ob->map)
197 { 178 {
… …
218 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 199 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
219 } 200 }
220 else 201 else
221 snprintf (buf, MAX_BUF, "mapinfo current"); 202 snprintf (buf, MAX_BUF, "mapinfo current");
222 203
223 Write_String_To_Socket (&socket, buf, strlen (buf)); 204 socket.send_packet (buf);
224 } 205 }
225 } 206 }
226 else if (socket.current_x != ob->x || socket.current_y != ob->y) 207 else if (socket.current_x != ob->x || socket.current_y != ob->y)
227 { 208 {
228 int dx = ob->x - socket.current_x; 209 int dx = ob->x - socket.current_x;
… …
266 if (!strncmp (buf, "spatial ", 8)) 247 if (!strncmp (buf, "spatial ", 8))
267 { 248 {
268 buf += 8; 249 buf += 8;
269 250
270 // initial map and its origin 251 // initial map and its origin
271 mapstruct *map = pl->ob->map; 252 maptile *map = pl->ob->map;
272 sint16 dx, dy; 253 sint16 dx, dy;
273 int mapx = pl->socket.mapx / 2 - pl->ob->x; 254 int mapx = pl->socket->mapx / 2 - pl->ob->x;
274 int mapy = pl->socket.mapy / 2 - pl->ob->y; 255 int mapy = pl->socket->mapy / 2 - pl->ob->y;
275 int max_distance = 8; // limit maximum path length to something generous 256 int max_distance = 8; // limit maximum path length to something generous
276 257
277 while (*buf && map && max_distance) 258 while (*buf && map && max_distance)
278 { 259 {
279 int dir = *buf++; 260 int dir = *buf++;
… …
330 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 311 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
331 } 312 }
332 else 313 else
333 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 314 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
334 315
335 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 316 pl->socket->send_packet (bigbuf);
336} 317}
337 318
338/** This is the Setup cmd - easy first implementation */ 319/** This is the Setup cmd - easy first implementation */
339void 320void
340SetUp (char *buf, int len, NewSocket * ns) 321SetUp (char *buf, int len, client_socket * ns)
341{ 322{
342 int s, slen; 323 int s, slen;
343 char *cmd, *param, cmdback[HUGE_BUF]; 324 char *cmd, *param, cmdback[HUGE_BUF];
344 325
345 /* run through the cmds of setup 326 /* run through the cmds of setup
… …
347 * 328 *
348 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 329 * 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 330 * The client then must sort this out
350 */ 331 */
351 332
352 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 333 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
334
353 strcpy (cmdback, "setup"); 335 strcpy (cmdback, "setup");
354 for (s = 0; s < len;) 336 for (s = 0; s < len; )
355 { 337 {
356
357 cmd = &buf[s]; 338 cmd = &buf[s];
358 339
359 /* find the next space, and put a null there */ 340 /* find the next space, and put a null there */
360 for (; buf[s] && buf[s] != ' '; s++); 341 for (; buf[s] && buf[s] != ' '; s++)
342 ;
343
361 buf[s++] = 0; 344 buf[s++] = 0;
345
362 while (buf[s] == ' ') 346 while (buf[s] == ' ')
363 s++; 347 s++;
364 348
365 if (s >= len) 349 if (s >= len)
366 break; 350 break;
367 351
368 param = &buf[s]; 352 param = &buf[s];
369 353
370 for (; buf[s] && buf[s] != ' '; s++); 354 for (; buf[s] && buf[s] != ' '; s++)
355 ;
356
371 buf[s++] = 0; 357 buf[s++] = 0;
358
372 while (buf[s] == ' ') 359 while (buf[s] == ' ')
373 s++; 360 s++;
374 361
375 slen = strlen (cmdback); 362 slen = strlen (cmdback);
376 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 363 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
537 * report a failure to the client. 524 * report a failure to the client.
538 */ 525 */
539 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 526 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
540 } 527 }
541 } /* for processing all the setup commands */ 528 } /* for processing all the setup commands */
529
542 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 530 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
543 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 531 ns->send_packet (cmdback);
544} 532}
545 533
546/** 534/**
547 * The client has requested to be added to the game. 535 * 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. 536 * 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, 537 * 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. 538 * it either has to be here or init_sockets needs to be exported.
551 */ 539 */
552void 540void
553AddMeCmd (char *buf, int len, NewSocket * ns) 541AddMeCmd (char *buf, int len, client_socket * ns)
554{ 542{
555 Settings oldsettings; 543 Settings oldsettings;
556 544
557 oldsettings = settings; 545 oldsettings = settings;
558 if (ns->status != Ns_Add || add_player (ns)) 546 if (ns->status != Ns_Add || add_player (ns))
559 { 547 ns->send_packet ("addme_failed");
560 Write_String_To_Socket (ns, "addme_failed", 12);
561 }
562 else 548 else
563 { 549 ns->send_packet ("addme_success");
564 /* Basically, the add_player copies the socket structure into 550
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; 551 settings = oldsettings;
574} 552}
575 553
576/** Reply to ExtendedInfos command */ 554/** Reply to ExtendedInfos command */
577void 555void
578ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 556ToggleExtendedInfos (char *buf, int len, client_socket * ns)
579{ 557{
580 char cmdback[MAX_BUF]; 558 char cmdback[MAX_BUF];
581 char command[50]; 559 char command[50];
582 int info, nextinfo; 560 int info, nextinfo;
583 561
584 cmdback[0] = '\0'; 562 cmdback[0] = '\0';
585 nextinfo = 0; 563 nextinfo = 0;
564
586 while (1) 565 while (1)
587 { 566 {
588 /* 1. Extract an info */ 567 /* 1. Extract an info */
589 info = nextinfo; 568 info = nextinfo;
569
590 while ((info < len) && (buf[info] == ' ')) 570 while ((info < len) && (buf[info] == ' '))
591 info++; 571 info++;
572
592 if (info >= len) 573 if (info >= len)
593 break; 574 break;
575
594 nextinfo = info + 1; 576 nextinfo = info + 1;
577
595 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 578 while ((nextinfo < len) && (buf[nextinfo] != ' '))
596 nextinfo++; 579 nextinfo++;
580
597 if (nextinfo - info >= 49) /*Erroneous info asked */ 581 if (nextinfo - info >= 49) /*Erroneous info asked */
598 continue; 582 continue;
583
599 strncpy (command, &(buf[info]), nextinfo - info); 584 strncpy (command, &(buf[info]), nextinfo - info);
600 command[nextinfo - info] = '\0'; 585
601 /* 2. Interpret info */ 586 /* 2. Interpret info */
602 if (!strcmp ("smooth", command)) 587 if (!strcmp ("smooth", command))
603 {
604 /* Toggle smoothing */ 588 /* Toggle smoothing */
605 ns->EMI_smooth = !ns->EMI_smooth; 589 ns->EMI_smooth = !ns->EMI_smooth;
606 }
607 else 590 else
608 {
609 /*bad value */ 591 /*bad value */;
610 } 592
611 /*3. Next info */ 593 /*3. Next info */
612 } 594 }
595
613 strcpy (cmdback, "ExtendedInfoSet"); 596 strcpy (cmdback, "ExtendedInfoSet");
597
614 if (ns->EMI_smooth) 598 if (ns->EMI_smooth)
615 { 599 {
616 strcat (cmdback, " "); 600 strcat (cmdback, " ");
617 strcat (cmdback, "smoothing"); 601 strcat (cmdback, "smoothing");
618 } 602 }
619 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 603
604 ns->send_packet (cmdback);
620} 605}
621 606
622/* 607/*
623#define MSG_TYPE_BOOK 1 608#define MSG_TYPE_BOOK 1
624#define MSG_TYPE_CARD 2 609#define MSG_TYPE_CARD 2
… …
627#define MSG_TYPE_MONUMENT 5 612#define MSG_TYPE_MONUMENT 5
628#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 613#define MSG_TYPE_SCRIPTED_DIALOG 6*/
629 614
630/** Reply to ExtendedInfos command */ 615/** Reply to ExtendedInfos command */
631void 616void
632ToggleExtendedText (char *buf, int len, NewSocket * ns) 617ToggleExtendedText (char *buf, int len, client_socket * ns)
633{ 618{
634 char cmdback[MAX_BUF]; 619 char cmdback[MAX_BUF];
635 char temp[10]; 620 char temp[10];
636 char command[50]; 621 char command[50];
637 int info, nextinfo, i, flag; 622 int info, nextinfo, i, flag;
638 623
639 cmdback[0] = '\0'; 624 cmdback[0] = '\0';
625
640 nextinfo = 0; 626 nextinfo = 0;
641 while (1) 627 while (1)
642 { 628 {
643 /* 1. Extract an info */ 629 /* 1. Extract an info */
644 info = nextinfo; 630 info = nextinfo;
631
645 while ((info < len) && (buf[info] == ' ')) 632 while ((info < len) && (buf[info] == ' '))
646 info++; 633 info++;
634
647 if (info >= len) 635 if (info >= len)
648 break; 636 break;
637
649 nextinfo = info + 1; 638 nextinfo = info + 1;
639
650 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 640 while ((nextinfo < len) && (buf[nextinfo] != ' '))
651 nextinfo++; 641 nextinfo++;
642
652 if (nextinfo - info >= 49) /*Erroneous info asked */ 643 if (nextinfo - info >= 49) /*Erroneous info asked */
653 continue; 644 continue;
645
654 strncpy (command, &(buf[info]), nextinfo - info); 646 strncpy (command, &(buf[info]), nextinfo - info);
655 command[nextinfo - info] = '\0'; 647 command[nextinfo - info] = '\0';
656 /* 2. Interpret info */ 648 /* 2. Interpret info */
657 i = sscanf (command, "%d", &flag); 649 i = sscanf (command, "%d", &flag);
650
658 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 651 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
659 ns->supported_readables |= (1 << flag); 652 ns->supported_readables |= (1 << flag);
660 /*3. Next info */ 653 /*3. Next info */
661 } 654 }
655
662 /* Send resulting state */ 656 /* Send resulting state */
663 strcpy (cmdback, "ExtendedTextSet"); 657 strcpy (cmdback, "ExtendedTextSet");
658
664 for (i = 0; i <= MSG_TYPE_LAST; i++) 659 for (i = 0; i <= MSG_TYPE_LAST; i++)
665 if (ns->supported_readables & (1 << i)) 660 if (ns->supported_readables & (1 << i))
666 { 661 {
667 strcat (cmdback, " "); 662 strcat (cmdback, " ");
668 snprintf (temp, sizeof (temp), "%d", i); 663 snprintf (temp, sizeof (temp), "%d", i);
669 strcat (cmdback, temp); 664 strcat (cmdback, temp);
670 } 665 }
671 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 666
667 ns->send_packet (cmdback);
672} 668}
673 669
674/** 670/**
675 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 671 * 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 672 * 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 673 * 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 674 * if we know the client wants it, might as well push it to the
679 * client. 675 * client.
680 */ 676 */
681static void 677static void
682SendSmooth (NewSocket * ns, uint16 face) 678SendSmooth (client_socket * ns, uint16 face)
683{ 679{
684 uint16 smoothface; 680 uint16 smoothface;
685 unsigned char reply[MAX_BUF];
686 SockList sl;
687 681
688 /* If we can't find a face, return and set it so we won't try to send this 682 /* If we can't find a face, return and set it so we won't try to send this
689 * again. 683 * again.
690 */ 684 */
691 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 685 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 693 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
700 esrv_send_face (ns, smoothface, 0); 694 esrv_send_face (ns, smoothface, 0);
701 695
702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 696 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
703 697
704 sl.buf = reply; 698 packet sl;
705 strcpy ((char *) sl.buf, "smooth "); 699
706 sl.len = strlen ((char *) sl.buf); 700 sl << "smooth "
707 SockList_AddShort (&sl, face); 701 << uint16 (face)
708 SockList_AddShort (&sl, smoothface); 702 << uint16 (smoothface);
703
709 Send_With_Handling (ns, &sl); 704 Send_With_Handling (ns, &sl);
710} 705}
711 706
712 /** 707 /**
713 * Tells client the picture it has to use 708 * Tells client the picture it has to use
714 * to smooth a picture number given as argument. 709 * to smooth a picture number given as argument.
715 */ 710 */
716void 711void
717AskSmooth (char *buf, int len, NewSocket * ns) 712AskSmooth (char *buf, int len, client_socket * ns)
718{ 713{
719 uint16 facenbr; 714 uint16 facenbr;
720 715
721 facenbr = atoi (buf); 716 facenbr = atoi (buf);
722 SendSmooth (ns, facenbr); 717 SendSmooth (ns, facenbr);
723} 718}
724
725
726
727
728 719
729/** 720/**
730 * This handles the general commands from the client (ie, north, fire, cast, 721 * This handles the general commands from the client (ie, north, fire, cast,
731 * etc.) 722 * etc.)
732 */ 723 */
… …
786 */ 777 */
787void 778void
788NewPlayerCmd (uint8 * buf, int len, player *pl) 779NewPlayerCmd (uint8 * buf, int len, player *pl)
789{ 780{
790 int time, repeat; 781 int time, repeat;
791 short packet;
792 unsigned char command[MAX_BUF]; 782 char command[MAX_BUF];
793 SockList sl; 783 int pktlen;
794 784
795 if (len < 7) 785 if (len < 7)
796 { 786 {
797 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 787 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
798 return; 788 return;
799 } 789 }
800 790
801 packet = GetShort_String (buf); 791 pktlen = net_uint16 (buf);
802 repeat = GetInt_String (buf + 2); 792 repeat = net_uint32 (buf + 2);
793
803 /* -1 is special - no repeat, but don't update */ 794 /* -1 is special - no repeat, but don't update */
804 if (repeat != -1) 795 if (repeat != -1)
805 {
806 pl->count = repeat; 796 pl->count = repeat;
807 } 797
808 if ((len - 4) >= MAX_BUF) 798 if ((len - 4) >= MAX_BUF)
809 len = MAX_BUF - 5; 799 len = MAX_BUF - 5;
810 800
811 strncpy ((char *) command, (char *) buf + 6, len - 4); 801 strncpy ((char *) command, (char *) buf + 6, len - 4);
812 command[len - 4] = '\0'; 802 command[len - 4] = '\0';
… …
822 return; 812 return;
823 } 813 }
824 814
825 /* This should not happen anymore. */ 815 /* This should not happen anymore. */
826 if (pl->ob->speed_left < -1.0) 816 if (pl->ob->speed_left < -1.0)
827 {
828 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 817 LOG (llevError, "Player has negative time - shouldn't do command.\n");
829 } 818
830 /* In c_new.c */ 819 /* In c_new.c */
831 execute_newserver_command (pl->ob, (char *) command); 820 execute_newserver_command (pl->ob, (char *) command);
832 /* Perhaps something better should be done with a left over count. 821 /* Perhaps something better should be done with a left over count.
833 * Cleaning up the input should probably be done first - all actions 822 * 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 823 * for the command that issued the count should be done before any other
835 * commands. 824 * commands.
836 */ 825 */
837 pl->count = 0; 826 pl->count = 0;
838 827
839 /* Send confirmation of command execution now */
840 sl.buf = command;
841 strcpy ((char *) sl.buf, "comc ");
842 sl.len = 5;
843 SockList_AddShort (&sl, packet);
844 if (FABS (pl->ob->speed) < 0.001) 828 if (FABS (pl->ob->speed) < 0.001)
845 time = MAX_TIME * 100; 829 time = MAX_TIME * 100;
846 else 830 else
847 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 831 time = (int) (MAX_TIME / FABS (pl->ob->speed));
848 SockList_AddInt (&sl, time); 832
833 /* Send confirmation of command execution now */
834
835 packet sl;
836 sl << "comc " << uint16 (pktlen) << uint32 (time);
849 Send_With_Handling (&pl->socket, &sl); 837 Send_With_Handling (pl->socket, &sl);
850} 838}
851 839
852 840
853/** This is a reply to a previous query. */ 841/** This is a reply to a previous query. */
854void 842void
… …
921 * something older than the server. If we assume the client will be 909 * 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 910 * backwards compatible, having it be a later version should not be a
923 * problem. 911 * problem.
924 */ 912 */
925void 913void
926VersionCmd (char *buf, int len, NewSocket * ns) 914VersionCmd (char *buf, int len, client_socket * ns)
927{ 915{
928 char *cp; 916 char *cp;
929 char version_warning[256]; 917 char version_warning[256];
930 918
931 if (!buf) 919 if (!buf)
… …
966 /* these are old dxclients */ 954 /* these are old dxclients */
967 /* Version 1024 added support for singular + plural name values - 955 /* Version 1024 added support for singular + plural name values -
968 * requiing this minimal value reduces complexity of that code, and it 956 * requiing this minimal value reduces complexity of that code, and it
969 * has been around for a long time. 957 * has been around for a long time.
970 */ 958 */
971 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) 959 if (ns->sc_version < 1026)
972 { 960 {
973 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 961 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 962 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
975 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 963 ns->send_packet (version_warning);
976 } 964 }
977 965
978 } 966 }
979} 967}
980 968
981/** sound related functions. */ 969/** sound related functions. */
982 970
983void 971void
984SetSound (char *buf, int len, NewSocket * ns) 972SetSound (char *buf, int len, client_socket * ns)
985{ 973{
986 ns->sound = atoi (buf); 974 ns->sound = atoi (buf);
987} 975}
988 976
989/** client wants the map resent */ 977/** client wants the map resent */
… …
999 */ 987 */
1000#if 0 988#if 0
1001 /* Okay, this is MAJOR UGLY. but the only way I know how to 989 /* Okay, this is MAJOR UGLY. but the only way I know how to
1002 * clear the "cache" 990 * clear the "cache"
1003 */ 991 */
1004 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 992 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1005 draw_client_map (pl->ob); 993 draw_client_map (pl->ob);
1006#endif 994#endif
1007} 995}
1008 996
1009/** 997/**
… …
1047/** 1035/**
1048 * Asks the client to query the user. This way, the client knows 1036 * 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) 1037 * it needs to send something back (vs just printing out a message)
1050 */ 1038 */
1051void 1039void
1052send_query (NewSocket * ns, uint8 flags, char *text) 1040send_query (client_socket * ns, uint8 flags, char *text)
1053{ 1041{
1054 char buf[MAX_BUF]; 1042 char buf[MAX_BUF];
1055 1043
1056 sprintf (buf, "query %d %s", flags, text ? text : ""); 1044 sprintf (buf, "query %d %s", flags, text ? text : "");
1057 Write_String_To_Socket (ns, buf, strlen (buf)); 1045 ns->send_packet (buf);
1058} 1046}
1059 1047
1060#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1048#define AddIfInt64(Old,New,Type) if (Old != New) {\
1061 Old = New; \ 1049 Old = New; \
1062 SockList_AddChar(&sl, Type); \ 1050 sl << uint8 (Type) << uint64 (New); \
1063 SockList_AddInt64(&sl, New); \
1064 } 1051 }
1065 1052
1066#define AddIfInt(Old,New,Type) if (Old != New) {\ 1053#define AddIfInt(Old,New,Type) if (Old != New) {\
1067 Old = New; \ 1054 Old = New; \
1068 SockList_AddChar(&sl, Type); \ 1055 sl << uint8 (Type) << uint32 (New); \
1069 SockList_AddInt(&sl, New); \
1070 } 1056 }
1071 1057
1072#define AddIfShort(Old,New,Type) if (Old != New) {\ 1058#define AddIfShort(Old,New,Type) if (Old != New) {\
1073 Old = New; \ 1059 Old = New; \
1074 SockList_AddChar(&sl, Type); \ 1060 sl << uint8 (Type) << uint16 (New); \
1075 SockList_AddShort(&sl, New); \
1076 } 1061 }
1077 1062
1078#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1063#define AddIfFloat(Old,New,Type) if (Old != New) {\
1079 Old = New; \ 1064 Old = New; \
1080 SockList_AddChar(&sl, Type); \ 1065 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1081 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1082 } 1066 }
1083 1067
1084#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1068#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1085 if (Old) free(Old);\
1086 Old = strdup_local(New);\ 1069 free(Old); Old = strdup (New);\
1087 SockList_AddChar(&sl, Type); \ 1070 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 } 1071 }
1092 1072
1093/** 1073/**
1094 * Sends a statistics update. We look at the old values, 1074 * Sends a statistics update. We look at the old values,
1095 * and only send what has changed. Stat mapping values are in newclient.h 1075 * and only send what has changed. Stat mapping values are in newclient.h
… …
1097 * commands for now. 1077 * commands for now.
1098 */ 1078 */
1099void 1079void
1100esrv_update_stats (player *pl) 1080esrv_update_stats (player *pl)
1101{ 1081{
1102 SockList sl;
1103 char buf[MAX_BUF]; 1082 char buf[MAX_BUF];
1104 uint16 flags; 1083 uint16 flags;
1105 1084
1106 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1085 packet sl;
1107 strcpy ((char *) sl.buf, "stats "); 1086 sl << "stats ";
1108 sl.len = strlen ((char *) sl.buf);
1109 1087
1110 if (pl->ob != NULL) 1088 if (pl->ob != NULL)
1111 { 1089 {
1112 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1090 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); 1091 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
… …
1121 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1099 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); 1100 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); 1101 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); 1102 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1125 } 1103 }
1104
1126 if (pl->socket.exp64) 1105 if (pl->socket->exp64)
1127 { 1106 {
1128 uint8 s; 1107 uint8 s;
1129 1108
1130 for (s = 0; s < NUM_SKILLS; s++) 1109 for (s = 0; s < NUM_SKILLS; s++)
1131 { 1110 {
1132 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1111 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1133 { 1112 {
1134
1135 /* Always send along the level if exp changes. This is only 1113 /* Always send along the level if exp changes. This is only
1136 * 1 extra byte, but keeps processing simpler. 1114 * 1 extra byte, but keeps processing simpler.
1137 */ 1115 */
1138 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1116 sl << uint8 (s + CS_STAT_SKILLINFO)
1139 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1117 << uint8 (pl->last_skill_ob[s]->level)
1140 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1118 << uint64 (pl->last_skill_ob[s]->stats.exp);
1119
1141 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1120 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1142 } 1121 }
1143 } 1122 }
1144 } 1123 }
1124
1145 if (pl->socket.exp64) 1125 if (pl->socket->exp64)
1146 {
1147 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1126 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1148 }
1149 else 1127 else
1150 {
1151 AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP); 1128 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1152 } 1129
1153 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1130 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1154 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1131 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); 1132 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); 1133 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1157 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1134 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1158 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1135 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); 1136 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); 1137 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1161 flags = 0; 1138 flags = 0;
1139
1162 if (pl->fire_on) 1140 if (pl->fire_on)
1163 flags |= SF_FIREON; 1141 flags |= SF_FIREON;
1142
1164 if (pl->run_on) 1143 if (pl->run_on)
1165 flags |= SF_RUNON; 1144 flags |= SF_RUNON;
1166 1145
1167 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1146 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1147
1168 if (pl->socket.sc_version < 1025) 1148 if (pl->socket->sc_version < 1025)
1169 {
1170 AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1149 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1171 }
1172 else 1150 else
1173 { 1151 {
1174 int i; 1152 int i;
1175 1153
1176 for (i = 0; i < NROFATTACKS; i++) 1154 for (i = 0; i < NROFATTACKS; i++)
1177 { 1155 {
1178 /* Skip ones we won't send */ 1156 /* Skip ones we won't send */
1179 if (atnr_cs_stat[i] == -1) 1157 if (atnr_cs_stat[i] == -1)
1180 continue; 1158 continue;
1159
1181 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1160 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1182 } 1161 }
1183 } 1162 }
1163
1184 if (pl->socket.monitor_spells) 1164 if (pl->socket->monitor_spells)
1185 { 1165 {
1186 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1166 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); 1167 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); 1168 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1189 } 1169 }
1170
1190 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1171 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); 1172 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1192 set_title (pl->ob, buf); 1173 set_title (pl->ob, buf);
1193 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1174 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1194 1175
1195 /* Only send it away if we have some actual data */ 1176 /* Only send it away if we have some actual data */
1196 if (sl.len > 6) 1177 if (sl.length () > 6)
1197 {
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); 1178 Send_With_Handling (pl->socket, &sl);
1202 }
1203 free (sl.buf);
1204} 1179}
1205
1206 1180
1207/** 1181/**
1208 * Tells the client that here is a player it should start using. 1182 * Tells the client that here is a player it should start using.
1209 */ 1183 */
1210void 1184void
1211esrv_new_player (player *pl, uint32 weight) 1185esrv_new_player (player *pl, uint32 weight)
1212{ 1186{
1213 SockList sl;
1214
1215 pl->last_weight = weight; 1187 pl->last_weight = weight;
1216 1188
1217 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1189 packet sl;
1190 sl << "player ";
1218 1191
1219 strcpy ((char *) sl.buf, "player "); 1192 sl << uint32 (pl->ob->count)
1220 sl.len = strlen ((char *) sl.buf); 1193 << uint32 (weight)
1221 SockList_AddInt (&sl, pl->ob->count); 1194 << uint32 (pl->ob->face->number)
1222 SockList_AddInt (&sl, weight); 1195 << data8 (pl->ob->name);
1223 SockList_AddInt (&sl, pl->ob->face->number);
1224 1196
1225 SockList_AddChar (&sl, (char) strlen (pl->ob->name));
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); 1197 Send_With_Handling (pl->socket, &sl);
1230 free (sl.buf);
1231 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1198 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1232} 1199}
1233
1234 1200
1235/** 1201/**
1236 * Need to send an animation sequence to the client. 1202 * Need to send an animation sequence to the client.
1237 * We will send appropriate face commands to the client if we haven't 1203 * 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 1204 * 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 1205 * how much we are sending - on the other hand, this should only happen
1240 * when the player logs in and picks stuff up. 1206 * when the player logs in and picks stuff up.
1241 */ 1207 */
1242void 1208void
1243esrv_send_animation (NewSocket * ns, short anim_num) 1209esrv_send_animation (client_socket * ns, short anim_num)
1244{ 1210{
1245 SockList sl;
1246 int i; 1211 int i;
1247 1212
1248 /* Do some checking on the anim_num we got. Note that the animations 1213 /* 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 1214 * are added in contigous order, so if the number is in the valid
1250 * range, it must be a valid animation. 1215 * range, it must be a valid animation.
… …
1253 { 1218 {
1254 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1219 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1255 return; 1220 return;
1256 } 1221 }
1257 1222
1258 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1223 packet sl;
1259 strcpy ((char *) sl.buf, "anim "); 1224
1260 sl.len = 5; 1225 sl << "anim "
1261 SockList_AddShort (&sl, anim_num); 1226 << uint16 (anim_num)
1262 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1227 << uint16 (0); /* flags - not used right now */
1228
1263 /* Build up the list of faces. Also, send any information (ie, the 1229 /* Build up the list of faces. Also, send any information (ie, the
1264 * the face itself) down to the client. 1230 * the face itself) down to the client.
1265 */ 1231 */
1266 for (i = 0; i < animations[anim_num].num_animations; i++) 1232 for (i = 0; i < animations[anim_num].num_animations; i++)
1267 { 1233 {
1268 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1234 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1269 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1235 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1270 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1236 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1271 } 1237 }
1238
1272 Send_With_Handling (ns, &sl); 1239 Send_With_Handling (ns, &sl);
1273 free (sl.buf); 1240
1274 ns->anims_sent[anim_num] = 1; 1241 ns->anims_sent[anim_num] = 1;
1275} 1242}
1276 1243
1277 1244
1278/****************************************************************************** 1245/******************************************************************************
… …
1284/** 1251/**
1285 * This adds face_num to a map cell at x,y. If the client doesn't have 1252 * 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. 1253 * the face yet, we will also send it.
1287 */ 1254 */
1288static void 1255static void
1289esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1256esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1290{ 1257{
1291 if (newmap->cells[x][y].count >= MAP_LAYERS) 1258 if (newmap->cells[x][y].count >= MAP_LAYERS)
1292 { 1259 {
1293 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1260 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1294 return; 1261 return;
1295 abort (); 1262 abort ();
1296 } 1263 }
1264
1297 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1265 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1298 newmap->cells[x][y].count++; 1266 newmap->cells[x][y].count++;
1267
1299 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1268 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1300 esrv_send_face (ns, face_num, 0); 1269 esrv_send_face (ns, face_num, 0);
1301} 1270}
1302 1271
1303struct LayerCell 1272struct LayerCell
… …
1312 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1281 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1313}; 1282};
1314 1283
1315/** Checkes if map cells have changed */ 1284/** Checkes if map cells have changed */
1316static int 1285static int
1317mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1286mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1318{ 1287{
1319 int k; 1288 int k;
1320 1289
1321 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1290 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1322 return 1; 1291 return 1;
… …
1335 * cnum is the client number, cur is the the buffer we put all of 1304 * 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 1305 * this data into. we return the end of the data. layers is
1337 * how many layers of data we should back. 1306 * how many layers of data we should back.
1338 */ 1307 */
1339static uint8 * 1308static uint8 *
1340compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1309compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1341{ 1310{
1342 int x, y, k; 1311 int x, y, k;
1343 int face; 1312 int face;
1344 unsigned char *fcur; 1313 unsigned char *fcur;
1345 struct MapLayer layers[MAP_LAYERS]; 1314 struct MapLayer layers[MAP_LAYERS];
… …
1405 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1374 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1406 } 1375 }
1407 return cur; 1376 return cur;
1408} 1377}
1409 1378
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
1446/** Clears a map cell */ 1379/** Clears a map cell */
1447static void 1380static void
1448map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1381map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1449{ 1382{
1450 cell->faces[0] = face0; 1383 cell->faces[0] = face0;
1451 cell->faces[1] = face1; 1384 cell->faces[1] = face1;
1452 cell->faces[2] = face2; 1385 cell->faces[2] = face2;
1453 cell->count = count; 1386 cell->count = count;
1454 cell->stat_hp = 0; 1387 cell->stat_hp = 0;
1388 cell->flags = 0;
1455 cell->player = 0; 1389 cell->player = 0;
1456} 1390}
1457 1391
1458#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1392#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1459#define MAX_LAYERS 3 1393#define MAX_LAYERS 3
1460 1394
… …
1488 * needs to get sent - if so, it adds the data, sending the head 1422 * 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 1423 * if needed, and returning 1. If this no data needs to get
1490 * sent, it returns zero. 1424 * sent, it returns zero.
1491 */ 1425 */
1492static int 1426static int
1493check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1427check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1494{ 1428{
1495 short face_num; 1429 short face_num;
1496 1430
1497 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1431 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1498 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1432 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1499 else 1433 else
1500 face_num = 0; 1434 face_num = 0;
1501 1435
1502 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1436 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1503 { 1437 {
1504 SockList_AddShort (&sl, face_num); 1438 sl << uint16 (face_num);
1505 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1439 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1506 esrv_send_face (&ns, face_num, 0); 1440 esrv_send_face (&ns, face_num, 0);
1441
1507 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1442 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1508 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1443 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1509 return 1; 1444 return 1;
1510 } 1445 }
1511 1446
… …
1531 * the case, it seems to make more sense to have these layer values 1466 * the case, it seems to make more sense to have these layer values
1532 * actually match. 1467 * actually match.
1533 */ 1468 */
1534 1469
1535static int 1470static int
1536update_space (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1471update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1537{ 1472{
1538 object *ob, *head; 1473 object *ob, *head;
1539 uint16 face_num; 1474 uint16 face_num;
1540 int bx, by, i; 1475 int bx, by, i;
1541 1476
1542 /* If there is a multipart object stored away, treat that as more important. 1477 /* If there is a multipart object stored away, treat that as more important.
1543 * If not, then do the normal processing. 1478 * If not, then do the normal processing.
1544 */ 1479 */
1545
1546 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1480 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1547 1481
1548 /* Check to see if this head is part of the set of objects 1482 /* Check to see if this head is part of the set of objects
1549 * we would normally send for this space. If so, then 1483 * we would normally send for this space. If so, then
1550 * don't use the head value. We need to do the check 1484 * don't use the head value. We need to do the check
… …
1715 1649
1716 /* Another hack - because of heads and whatnot, this face may match one 1650 /* 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 1651 * we already sent for a lower layer. In that case, don't send
1718 * this one. 1652 * this one.
1719 */ 1653 */
1720 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) 1654 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1721 {
1722 face_num = 0; 1655 face_num = 0;
1723 }
1724 1656
1725 /* We've gotten what face we want to use for the object. Now see if 1657 /* 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. 1658 * if it has changed since we last sent it to the client.
1727 */ 1659 */
1728 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1660 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1729 { 1661 {
1730 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1662 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1731 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1663 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1732 esrv_send_face (ns, face_num, 0); 1664 esrv_send_face (&ns, face_num, 0);
1733 SockList_AddShort (sl, face_num); 1665
1666 sl << uint16 (face_num);
1734 return 1; 1667 return 1;
1735 } 1668 }
1669
1736 /* Nothing changed */ 1670 /* Nothing changed */
1737 return 0; 1671 return 0;
1738} 1672}
1739 1673
1740/** 1674/**
… …
1755 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1689 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1756 * take. 1690 * take.
1757 */ 1691 */
1758 1692
1759static inline int 1693static inline int
1760update_smooth (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1694update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1761{ 1695{
1762 object *ob; 1696 object *ob;
1763 int smoothlevel; /* old face_num; */ 1697 int smoothlevel; /* old face_num; */
1764 1698
1765 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1699 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1770 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1704 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1771 smoothlevel = 0; 1705 smoothlevel = 0;
1772 else 1706 else
1773 { 1707 {
1774 smoothlevel = ob->smoothlevel; 1708 smoothlevel = ob->smoothlevel;
1775 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1709 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1776 SendSmooth (ns, ob->face->number); 1710 SendSmooth (&ns, ob->face->number);
1777 } /* else not already head object or blank face */ 1711 } /* else not already head object or blank face */
1778 1712
1779 /* We've gotten what face we want to use for the object. Now see if 1713 /* 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. 1714 * if it has changed since we last sent it to the client.
1781 */ 1715 */
1782 if (smoothlevel > 255) 1716 if (smoothlevel > 255)
1783 smoothlevel = 255; 1717 smoothlevel = 255;
1784 else if (smoothlevel < 0) 1718 else if (smoothlevel < 0)
1785 smoothlevel = 0; 1719 smoothlevel = 0;
1720
1786 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1721 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1787 { 1722 {
1788 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1723 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1789 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1724 sl << uint8 (smoothlevel);
1790 return 1; 1725 return 1;
1791 } 1726 }
1727
1792 /* Nothing changed */ 1728 /* Nothing changed */
1793 return 0; 1729 return 0;
1794} 1730}
1795 1731
1796/** 1732/**
1797 * Returns the size of a data for a map square as returned by 1733 * Returns the size of a data for a map square as returned by
1798 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1734 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1799 * available. 1735 * available.
1800 */ 1736 */
1801int 1737int
1802getExtendedMapInfoSize (NewSocket * ns) 1738getExtendedMapInfoSize (client_socket * ns)
1803{ 1739{
1804 int result = 0; 1740 int result = 0;
1805 1741
1806 if (ns->ext_mapinfos) 1742 if (ns->ext_mapinfos)
1807 { 1743 {
… …
1837draw_client_map1 (object *pl) 1773draw_client_map1 (object *pl)
1838{ 1774{
1839 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1775 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1840 sint16 nx, ny; 1776 sint16 nx, ny;
1841 int estartlen, eoldlen; 1777 int estartlen, eoldlen;
1842 SockList sl;
1843 SockList esl; /*For extended Map info */
1844 uint16 mask, emask; 1778 uint16 mask, emask;
1845 uint8 eentrysize; 1779 uint8 eentrysize;
1846 uint16 ewhatstart, ewhatflag; 1780 uint16 ewhatstart, ewhatflag;
1847 uint8 extendedinfos; 1781 uint8 extendedinfos;
1848 mapstruct *m; 1782 maptile *m;
1849 1783
1850 NewSocket & socket = pl->contr->socket; 1784 client_socket &socket = *pl->contr->socket;
1851 1785
1852 check_map_change (pl->contr); 1786 check_map_change (pl->contr);
1853 1787
1854 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1788 packet sl;
1855 if (socket.mapmode == Map1Cmd) 1789 packet esl;
1856 strcpy ((char *) sl.buf, "map1 "); 1790
1857 else 1791 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1858 strcpy ((char *) sl.buf, "map1a ");
1859 sl.len = strlen ((char *) sl.buf);
1860 startlen = sl.len; 1792 startlen = sl.length ();
1793
1861 /*Extendedmapinfo structure initialisation */ 1794 /*Extendedmapinfo structure initialisation */
1862 if (socket.ext_mapinfos) 1795 if (socket.ext_mapinfos)
1863 { 1796 {
1864 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1865 strcpy ((char *) esl.buf, "mapextended ");
1866 esl.len = strlen ((char *) esl.buf);
1867 extendedinfos = EMI_NOREDRAW; 1797 extendedinfos = EMI_NOREDRAW;
1798
1868 if (socket.EMI_smooth) 1799 if (socket.EMI_smooth)
1869 extendedinfos |= EMI_SMOOTH; 1800 extendedinfos |= EMI_SMOOTH;
1801
1870 ewhatstart = esl.len; 1802 ewhatstart = esl.length ();
1871 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1803 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1872 could need to be taken away */ 1804 could need to be taken away */
1873 SockList_AddChar (&esl, extendedinfos);
1874 eentrysize = getExtendedMapInfoSize (&socket); 1805 eentrysize = getExtendedMapInfoSize (&socket);
1875 SockList_AddChar (&esl, eentrysize); 1806 esl << "mapextended "
1807 << uint8 (extendedinfos)
1808 << uint8 (eentrysize);
1809
1876 estartlen = esl.len; 1810 estartlen = esl.length ();
1877 } 1811 }
1878 else 1812 else
1879 { 1813 {
1880 /* suppress compiler warnings */ 1814 /* suppress compiler warnings */
1881 ewhatstart = 0; 1815 ewhatstart = 0;
1882 ewhatflag = 0; 1816 ewhatflag = 0;
1883 estartlen = 0; 1817 estartlen = 0;
1884 } 1818 }
1819
1885 /* Init data to zero */ 1820 /* Init data to zero */
1886 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1821 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1887 1822
1888 /* x,y are the real map locations. ax, ay are viewport relative 1823 /* x,y are the real map locations. ax, ay are viewport relative
1889 * locations. 1824 * locations.
… …
1893 /* We could do this logic as conditionals in the if statement, 1828 /* We could do this logic as conditionals in the if statement,
1894 * but that started to get a bit messy to look at. 1829 * but that started to get a bit messy to look at.
1895 */ 1830 */
1896 max_x = pl->x + (socket.mapx + 1) / 2; 1831 max_x = pl->x + (socket.mapx + 1) / 2;
1897 max_y = pl->y + (socket.mapy + 1) / 2; 1832 max_y = pl->y + (socket.mapy + 1) / 2;
1833
1898 if (socket.mapmode == Map1aCmd) 1834 if (socket.mapmode == Map1aCmd)
1899 { 1835 {
1900 max_x += MAX_HEAD_OFFSET; 1836 max_x += MAX_HEAD_OFFSET;
1901 max_y += MAX_HEAD_OFFSET; 1837 max_y += MAX_HEAD_OFFSET;
1902 } 1838 }
… …
1917 */ 1853 */
1918 if (ax >= socket.mapx || ay >= socket.mapy) 1854 if (ax >= socket.mapx || ay >= socket.mapy)
1919 { 1855 {
1920 int i, got_one; 1856 int i, got_one;
1921 1857
1922 oldlen = sl.len; 1858 oldlen = sl.length ();
1923 1859
1924 SockList_AddShort (&sl, mask); 1860 sl << uint16 (mask);
1925 1861
1926 if (check_head (sl, socket, ax, ay, 2)) 1862 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1927 mask |= 0x4;
1928 if (check_head (sl, socket, ax, ay, 1)) 1863 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1929 mask |= 0x2;
1930 if (check_head (sl, socket, ax, ay, 0)) 1864 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1931 mask |= 0x1;
1932 1865
1933 /* If all we are doing is sending 0 (blank) faces, we don't 1866 /* If all we are doing is sending 0 (blank) faces, we don't
1934 * actually need to send that - just the coordinates 1867 * actually need to send that - just the coordinates
1935 * with no faces tells the client to blank out the 1868 * with no faces tells the client to blank out the
1936 * space. 1869 * space.
1937 */ 1870 */
1938 got_one = 0; 1871 got_one = 0;
1939 for (i = oldlen + 2; i < sl.len; i++) 1872 for (i = oldlen + 2; i < sl.length (); i++)
1940 {
1941 if (sl.buf[i]) 1873 if (sl.buf[i])
1942 got_one = 1; 1874 got_one = 1;
1943 }
1944 1875
1945 if (got_one && (mask & 0xf)) 1876 if (got_one && (mask & 0xf))
1946 {
1947 sl.buf[oldlen + 1] = mask & 0xff; 1877 sl.buf[oldlen + 1] = mask & 0xff;
1948 }
1949 else 1878 else
1950 { /*either all faces blank, either no face at all */ 1879 { /*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 */ 1880 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1952 sl.len = oldlen + 2; 1881 sl.reset (oldlen + 2);
1953 else 1882 else
1954 sl.len = oldlen; 1883 sl.reset (oldlen);
1955 } 1884 }
1885
1956 /*What concerns extendinfos, nothing to be done for now 1886 /*What concerns extendinfos, nothing to be done for now
1957 * (perhaps effects layer later) 1887 * (perhaps effects layer later)
1958 */ 1888 */
1959 continue; /* don't do processing below */ 1889 continue; /* don't do processing below */
1960 } 1890 }
1961 1891
1962 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1892 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1963 1893
1964 d = pl->contr->blocked_los[ax][ay]; 1894 d = pl->contr->blocked_los[ax][ay];
1965 1895
1966 /* If the coordinates are not valid, or it is too dark to see, 1896 /* If the coordinates are not valid, or it is too dark to see,
1967 * we tell the client as such 1897 * we tell the client as such
1968 */ 1898 */
1969 nx = x; 1899 nx = x;
1970 ny = y; 1900 ny = y;
1971 m = get_map_from_coord (pl->map, &nx, &ny); 1901 m = get_map_from_coord (pl->map, &nx, &ny);
1902
1972 if (!m) 1903 if (!m)
1973 { 1904 {
1974 /* space is out of map. Update space and clear values 1905 /* space is out of map. Update space and clear values
1975 * if this hasn't already been done. If the space is out 1906 * if this hasn't already been done. If the space is out
1976 * of the map, it shouldn't have a head 1907 * of the map, it shouldn't have a head
1977 */ 1908 */
1978 if (lastcell.count != -1) 1909 if (lastcell.count != -1)
1979 { 1910 {
1980 SockList_AddShort (&sl, mask); 1911 sl << uint16 (mask);
1981 map_clearcell (&lastcell, 0, 0, 0, -1); 1912 map_clearcell (&lastcell, 0, 0, 0, -1);
1982 } 1913 }
1983 } 1914 }
1984 else if (d > 3) 1915 else if (d > 3)
1985 { 1916 {
… …
1987 1918
1988 /* This block deals with spaces that are not visible for whatever 1919 /* This block deals with spaces that are not visible for whatever
1989 * reason. Still may need to send the head for this space. 1920 * reason. Still may need to send the head for this space.
1990 */ 1921 */
1991 1922
1992 oldlen = sl.len; 1923 oldlen = sl.length ();
1993 1924
1994 SockList_AddShort (&sl, mask); 1925 sl << uint16 (mask);
1926
1995 if (lastcell.count != -1) 1927 if (lastcell.count != -1)
1996 need_send = 1; 1928 need_send = 1;
1929
1997 count = -1; 1930 count = -1;
1998 1931
1999 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1932 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2000 { 1933 {
2001 /* Now check to see if any heads need to be sent */ 1934 /* Now check to see if any heads need to be sent */
2002 1935
2003 if (check_head (sl, socket, ax, ay, 2)) 1936 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2004 mask |= 0x4;
2005 if (check_head (sl, socket, ax, ay, 1)) 1937 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2006 mask |= 0x2;
2007 if (check_head (sl, socket, ax, ay, 0)) 1938 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2008 mask |= 0x1;
2009 1939
2010 lastcell.count = count; 1940 lastcell.count = count;
2011
2012 } 1941 }
2013 else 1942 else
2014 { 1943 {
2015 struct MapCell *cell = &lastcell;
2016
2017 /* properly clear a previously sent big face */ 1944 /* properly clear a previously sent big face */
2018 if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) 1945 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1946 || lastcell.stat_hp || lastcell.flags || lastcell.player)
2019 need_send = 1; 1947 need_send = 1;
1948
2020 map_clearcell (&lastcell, 0, 0, 0, count); 1949 map_clearcell (&lastcell, 0, 0, 0, count);
2021 } 1950 }
2022 1951
2023 if ((mask & 0xf) || need_send) 1952 if ((mask & 0xf) || need_send)
2024 {
2025 sl.buf[oldlen + 1] = mask & 0xff; 1953 sl.buf[oldlen + 1] = mask & 0xff;
2026 }
2027 else 1954 else
2028 {
2029 sl.len = oldlen; 1955 sl.reset (oldlen);
2030 }
2031 } 1956 }
2032 else 1957 else
2033 { 1958 {
2034 /* In this block, the space is visible or there are head objects 1959 /* In this block, the space is visible or there are head objects
2035 * we need to send. 1960 * we need to send.
… …
2037 1962
2038 /* Rather than try to figure out what everything that we might 1963 /* Rather than try to figure out what everything that we might
2039 * need to send is, then form the packet after that, 1964 * need to send is, then form the packet after that,
2040 * we presume that we will in fact form a packet, and update 1965 * 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, 1966 * 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 1967 * we just back out sl.length () to the old value, and no harm
2043 * is done. 1968 * is done.
2044 * I think this is simpler than doing a bunch of checks to see 1969 * 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 1970 * what if anything we need to send, setting the bits, then
2046 * doing those checks again to add the real data. 1971 * doing those checks again to add the real data.
2047 */ 1972 */
2048 oldlen = sl.len; 1973 oldlen = sl.length ();
2049 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1974 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2050 eoldlen = esl.len; 1975 eoldlen = esl.length ();
2051 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1976 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2052 SockList_AddShort (&sl, mask); 1977 sl << uint16 (mask);
2053 1978
2054 if (socket.ext_mapinfos) 1979 if (socket.ext_mapinfos)
2055 SockList_AddShort (&esl, emask); 1980 esl << uint16 (emask);
2056 1981
2057 unsigned char dummy; 1982 unsigned char dummy;
2058 unsigned char *last_ext = &dummy; 1983 unsigned char *last_ext = &dummy;
2059 1984
2060 /* Darkness changed */ 1985 /* Darkness changed */
… …
2063 mask |= 0x8; 1988 mask |= 0x8;
2064 1989
2065 if (socket.extmap) 1990 if (socket.extmap)
2066 { 1991 {
2067 *last_ext |= 0x80; 1992 *last_ext |= 0x80;
2068 last_ext = sl.buf + sl.len; 1993 last_ext = sl.buf + sl.length ();
2069 SockList_AddChar (&sl, d); 1994 sl << uint8 (d);
2070 } 1995 }
2071 else 1996 else
2072 SockList_AddChar (&sl, 255 - 64 * d); 1997 sl << uint8 (255 - 64 * d);
2073 } 1998 }
2074 1999
2075 lastcell.count = d; 2000 lastcell.count = d;
2076 2001
2077 if (socket.extmap) 2002 if (socket.extmap)
2078 { 2003 {
2079 uint8 stat_hp = 0; 2004 uint8 stat_hp = 0;
2080 uint8 stat_width = 0; 2005 uint8 stat_width = 0;
2006 uint8 flags = 0;
2081 tag_t player = 0; 2007 UUID player = 0;
2082 2008
2083 // send hp information, if applicable 2009 // send hp information, if applicable
2084 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2010 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2085 { 2011 {
2086 if (op->head || op->invisible) 2012 if (op->head || op->invisible)
… …
2093 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 2019 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2094 stat_width = op->arch->tail_x; 2020 stat_width = op->arch->tail_x;
2095 } 2021 }
2096 } 2022 }
2097 2023
2024 if (op->msg && op->msg[0] == '@')
2025 flags |= 1;
2026
2098 if (op->type == PLAYER && op != pl) 2027 if (op->type == PLAYER && op != pl)
2099 player = op->count; 2028 player = op->count;
2100 } 2029 }
2101 2030
2102 if (lastcell.stat_hp != stat_hp) 2031 if (lastcell.stat_hp != stat_hp)
2103 { 2032 {
2104 lastcell.stat_hp = stat_hp; 2033 lastcell.stat_hp = stat_hp;
2105 2034
2106 mask |= 0x8; 2035 mask |= 0x8;
2107 *last_ext |= 0x80; 2036 *last_ext |= 0x80;
2108 last_ext = sl.buf + sl.len; 2037 last_ext = sl.buf + sl.length ();
2109 SockList_AddChar (&sl, 5); 2038
2110 SockList_AddChar (&sl, stat_hp); 2039 sl << uint8 (5) << uint8 (stat_hp);
2111 2040
2112 if (stat_width > 1) 2041 if (stat_width > 1)
2113 { 2042 {
2114 *last_ext |= 0x80; 2043 *last_ext |= 0x80;
2115 last_ext = sl.buf + sl.len; 2044 last_ext = sl.buf + sl.length ();
2116 SockList_AddChar (&sl, 6); 2045
2117 SockList_AddChar (&sl, stat_width); 2046 sl << uint8 (6) << uint8 (stat_width);
2118 } 2047 }
2119 } 2048 }
2120 2049
2121 if (lastcell.player !=player) 2050 if (lastcell.player != player)
2122 { 2051 {
2123 lastcell.player = player; 2052 lastcell.player = player;
2124 2053
2125 mask |= 0x8; 2054 mask |= 0x8;
2126 *last_ext |= 0x80; 2055 *last_ext |= 0x80;
2127 last_ext = sl.buf + sl.len; 2056 last_ext = sl.buf + sl.length ();
2128 SockList_AddChar (&sl, 0x47); 2057
2129 SockList_AddChar (&sl, 4); 2058 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2130 SockList_AddInt (&sl, player); 2059 }
2060
2061 if (lastcell.flags != flags)
2062 {
2063 lastcell.flags = flags;
2064
2065 mask |= 0x8;
2066 *last_ext |= 0x80;
2067 last_ext = sl.buf + sl.length ();
2068
2069 sl << uint8 (8) << uint8 (flags);
2131 } 2070 }
2132 } 2071 }
2133 2072
2134 /* Floor face */ 2073 /* Floor face */
2135 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 2074 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2136 mask |= 0x4; 2075 mask |= 0x4;
2137 2076
2138 if (socket.EMI_smooth) 2077 if (socket.EMI_smooth)
2139 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 2078 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2140 emask |= 0x4; 2079 emask |= 0x4;
2141 2080
2142 /* Middle face */ 2081 /* Middle face */
2143 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 2082 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2144 mask |= 0x2; 2083 mask |= 0x2;
2145 2084
2146 if (socket.EMI_smooth) 2085 if (socket.EMI_smooth)
2147 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 2086 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2148 emask |= 0x2; 2087 emask |= 0x2;
2149 2088
2150 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 2089 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2151 { 2090 {
2152 if (lastcell.faces[0] != pl->face->number) 2091 if (lastcell.faces[0] != pl->face->number)
2153 { 2092 {
2154 lastcell.faces[0] = pl->face->number; 2093 lastcell.faces[0] = pl->face->number;
2155 mask |= 0x1; 2094 mask |= 0x1;
2095
2156 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 2096 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2157 esrv_send_face (&socket, pl->face->number, 0); 2097 esrv_send_face (&socket, pl->face->number, 0);
2158 SockList_AddShort (&sl, pl->face->number); 2098
2099 sl << uint16 (pl->face->number);
2159 } 2100 }
2160 } 2101 }
2161 /* Top face */
2162 else 2102 else
2163 { 2103 {
2104 /* Top face */
2164 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 2105 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2165 mask |= 0x1; 2106 mask |= 0x1;
2107
2166 if (socket.EMI_smooth) 2108 if (socket.EMI_smooth)
2167 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 2109 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2168 {
2169 emask |= 0x1; 2110 emask |= 0x1;
2170 }
2171 } 2111 }
2112
2172 /* Check to see if we are in fact sending anything for this 2113 /* Check to see if we are in fact sending anything for this
2173 * space by checking the mask. If so, update the mask. 2114 * space by checking the mask. If so, update the mask.
2174 * if not, reset the len to that from before adding the mask 2115 * if not, reset the len to that from before adding the mask
2175 * value, so we don't send those bits. 2116 * value, so we don't send those bits.
2176 */ 2117 */
2177 if (mask & 0xf) 2118 if (mask & 0xf)
2178 {
2179 sl.buf[oldlen + 1] = mask & 0xff; 2119 sl.buf[oldlen + 1] = mask & 0xff;
2180 }
2181 else 2120 else
2182 {
2183 sl.len = oldlen; 2121 sl.reset (oldlen);
2184 } 2122
2185 if (emask & 0xf) 2123 if (emask & 0xf)
2186 {
2187 esl.buf[eoldlen + 1] = emask & 0xff; 2124 esl.buf[eoldlen + 1] = emask & 0xff;
2188 }
2189 else 2125 else
2190 {
2191 esl.len = eoldlen; 2126 esl.reset (eoldlen);
2192 }
2193 } /* else this is a viewable space */ 2127 } /* else this is a viewable space */
2194 } /* for x loop */ 2128 } /* for x loop */
2195 } /* for y loop */ 2129 } /* for y loop */
2196 2130
2197 /* Verify that we in fact do need to send this */ 2131 /* Verify that we in fact do need to send this */
2198 if (socket.ext_mapinfos) 2132 if (socket.ext_mapinfos)
2199 { 2133 {
2200 if (!(sl.len > startlen || socket.sent_scroll)) 2134 if (!(sl.length () > startlen || socket.sent_scroll))
2201 { 2135 {
2202 /* No map data will follow, so don't say the client 2136 /* No map data will follow, so don't say the client
2203 * it doesn't need draw! 2137 * it doesn't need draw!
2204 */ 2138 */
2205 ewhatflag &= (~EMI_NOREDRAW); 2139 ewhatflag &= (~EMI_NOREDRAW);
2206 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2140 esl.buf[ewhatstart + 1] = ewhatflag & 0xff;
2207 } 2141 }
2142
2208 if (esl.len > estartlen) 2143 if (esl.length () > estartlen)
2209 {
2210 Send_With_Handling (&socket, &esl); 2144 Send_With_Handling (&socket, &esl);
2211 }
2212 free (esl.buf);
2213 } 2145 }
2146
2214 if (sl.len > startlen || socket.sent_scroll) 2147 if (sl.length () > startlen || socket.sent_scroll)
2215 { 2148 {
2216 Send_With_Handling (&socket, &sl); 2149 Send_With_Handling (&socket, &sl);
2217 socket.sent_scroll = 0; 2150 socket.sent_scroll = 0;
2218 } 2151 }
2219 free (sl.buf);
2220} 2152}
2221 2153
2222/** 2154/**
2223 * Draws client map. 2155 * Draws client map.
2224 */ 2156 */
… …
2229 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2161 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2230 New_Face *face, *floor; 2162 New_Face *face, *floor;
2231 New_Face *floor2; 2163 New_Face *floor2;
2232 int d, mflags; 2164 int d, mflags;
2233 struct Map newmap; 2165 struct Map newmap;
2234 mapstruct *m, *pm; 2166 maptile *m, *pm;
2235 2167
2236 if (pl->type != PLAYER) 2168 if (pl->type != PLAYER)
2237 { 2169 {
2238 LOG (llevError, "draw_client_map called with non player/non eric-server\n"); 2170 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2239 return; 2171 return;
… …
2248 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2180 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2249 return; 2181 return;
2250 2182
2251 memset (&newmap, 0, sizeof (struct Map)); 2183 memset (&newmap, 0, sizeof (struct Map));
2252 2184
2253 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2185 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2254 { 2186 {
2255 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2187 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2256 { 2188 {
2257 ax = i; 2189 ax = i;
2258 ay = j; 2190 ay = j;
2259 m = pm; 2191 m = pm;
2260 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2192 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2275 { 2207 {
2276 update_los (pl); 2208 update_los (pl);
2277 pl->contr->do_los = 0; 2209 pl->contr->do_los = 0;
2278 } 2210 }
2279 2211
2280 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2281 {
2282 /* Big maps need a different drawing mechanism to work */ 2212 /* Big maps need a different drawing mechanism to work */
2283 draw_client_map1 (pl); 2213 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} 2214}
2347 2215
2348 2216
2349/*****************************************************************************/ 2217/*****************************************************************************/
2350 2218
… …
2356 2224
2357/*****************************************************************************/ 2225/*****************************************************************************/
2358void 2226void
2359send_plugin_custom_message (object *pl, char *buf) 2227send_plugin_custom_message (object *pl, char *buf)
2360{ 2228{
2361 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2229 pl->contr->socket->send_packet (buf);
2362} 2230}
2363 2231
2364/** 2232/**
2365 * This sends the skill number to name mapping. We ignore 2233 * This sends the skill number to name mapping. We ignore
2366 * the params - we always send the same info no matter what. 2234 * the params - we always send the same info no matter what.
2367 */ 2235 */
2368void 2236void
2369send_skill_info (NewSocket * ns, char *params) 2237send_skill_info (client_socket *ns, char *params)
2370{ 2238{
2371 SockList sl; 2239 packet sl;
2372 int i; 2240 sl << "replyinfo skill_info\n";
2373 2241
2374 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2375 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2376 for (i = 1; i < NUM_SKILLS; i++) 2242 for (int i = 1; i < NUM_SKILLS; i++)
2377 { 2243 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]); 2244
2379 }
2380 sl.len = strlen ((char *) sl.buf);
2381 if (sl.len >= MAXSOCKBUF) 2245 if (sl.length () >= MAXSOCKBUF)
2382 { 2246 {
2383 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2247 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2384 fatal (0); 2248 fatal (0);
2385 } 2249 }
2250
2386 Send_With_Handling (ns, &sl); 2251 Send_With_Handling (ns, &sl);
2387 free (sl.buf);
2388} 2252}
2389 2253
2390/** 2254/**
2391 * This sends the spell path to name mapping. We ignore 2255 * This sends the spell path to name mapping. We ignore
2392 * the params - we always send the same info no matter what. 2256 * the params - we always send the same info no matter what.
2393 */ 2257 */
2394void 2258void
2395send_spell_paths (NewSocket * ns, char *params) 2259send_spell_paths (client_socket * ns, char *params)
2396{ 2260{
2397 SockList sl; 2261 packet sl;
2398 int i;
2399 2262
2400 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2263 sl << "replyinfo spell_paths\n";
2401 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2264
2402 for (i = 0; i < NRSPELLPATHS; i++) 2265 for (int i = 0; i < NRSPELLPATHS; i++)
2403 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2266 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2404 sl.len = strlen ((char *) sl.buf); 2267
2405 if (sl.len >= MAXSOCKBUF) 2268 if (sl.length () >= MAXSOCKBUF)
2406 { 2269 {
2407 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2270 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2408 fatal (0); 2271 fatal (0);
2409 } 2272 }
2273
2410 Send_With_Handling (ns, &sl); 2274 Send_With_Handling (ns, &sl);
2411 free (sl.buf);
2412} 2275}
2413 2276
2414/** 2277/**
2415 * This looks for any spells the player may have that have changed their stats. 2278 * 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 2279 * it then sends an updspell packet for each spell that has changed in this way
2417 */ 2280 */
2418void 2281void
2419esrv_update_spells (player *pl) 2282esrv_update_spells (player *pl)
2420{ 2283{
2421 SockList sl;
2422 int flags = 0;
2423 object *spell;
2424
2425 if (!pl->socket.monitor_spells) 2284 if (!pl->socket->monitor_spells)
2426 return; 2285 return;
2286
2427 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2287 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2428 { 2288 {
2429 if (spell->type == SPELL) 2289 if (spell->type == SPELL)
2430 { 2290 {
2291 int flags = 0;
2292
2431 /* check if we need to update it */ 2293 /* check if we need to update it */
2432 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2294 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2433 { 2295 {
2434 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2296 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2435 flags |= UPD_SP_MANA; 2297 flags |= UPD_SP_MANA;
2436 } 2298 }
2299
2437 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2300 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2438 { 2301 {
2439 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2302 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2440 flags |= UPD_SP_GRACE; 2303 flags |= UPD_SP_GRACE;
2441 } 2304 }
2305
2442 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2306 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2443 { 2307 {
2444 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2308 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2445 flags |= UPD_SP_DAMAGE; 2309 flags |= UPD_SP_DAMAGE;
2446 } 2310 }
2311
2447 if (flags != 0) 2312 if (flags)
2448 { 2313 {
2449 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2314 packet sl;
2450 strcpy ((char *) sl.buf, "updspell "); 2315
2451 sl.len = strlen ((char *) sl.buf); 2316 sl << "updspell "
2452 SockList_AddChar (&sl, flags); 2317 << uint8 (flags)
2453 SockList_AddInt (&sl, spell->count); 2318 << uint32 (spell->count);
2454 if (flags & UPD_SP_MANA) 2319
2455 SockList_AddShort (&sl, spell->last_sp); 2320 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2456 if (flags & UPD_SP_GRACE) 2321 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2457 SockList_AddShort (&sl, spell->last_grace); 2322 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2458 if (flags & UPD_SP_DAMAGE) 2323
2459 SockList_AddShort (&sl, spell->last_eat);
2460 flags = 0;
2461 Send_With_Handling (&pl->socket, &sl); 2324 Send_With_Handling (pl->socket, &sl);
2462 free (sl.buf);
2463 } 2325 }
2464 } 2326 }
2465 } 2327 }
2466} 2328}
2467 2329
2468void 2330void
2469esrv_remove_spell (player *pl, object *spell) 2331esrv_remove_spell (player *pl, object *spell)
2470{ 2332{
2471 SockList sl;
2472
2473 if (!pl->socket.monitor_spells) 2333 if (!pl->socket->monitor_spells)
2474 return; 2334 return;
2335
2475 if (!pl || !spell || spell->env != pl->ob) 2336 if (!pl || !spell || spell->env != pl->ob)
2476 { 2337 {
2477 LOG (llevError, "Invalid call to esrv_remove_spell"); 2338 LOG (llevError, "Invalid call to esrv_remove_spell");
2478 return; 2339 return;
2479 } 2340 }
2480 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2341
2481 strcpy ((char *) sl.buf, "delspell "); 2342 packet sl;
2482 sl.len = strlen ((char *) sl.buf); 2343
2483 SockList_AddInt (&sl, spell->count); 2344 sl << "delspell "
2345 << uint32 (spell->count);
2346
2484 Send_With_Handling (&pl->socket, &sl); 2347 Send_With_Handling (pl->socket, &sl);
2485 free (sl.buf);
2486} 2348}
2487 2349
2488/* appends the spell *spell to the Socklist we will send the data to. */ 2350/* appends the spell *spell to the Socklist we will send the data to. */
2489static void 2351static void
2490append_spell (player *pl, SockList * sl, object *spell) 2352append_spell (player *pl, packet &sl, object *spell)
2491{ 2353{
2492 int len, i, skill = 0; 2354 int len, i, skill = 0;
2493 2355
2494 if (!(spell->name)) 2356 if (!(spell->name))
2495 { 2357 {
2496 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2358 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2497 return; 2359 return;
2498 } 2360 }
2499 SockList_AddInt (sl, spell->count); 2361
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 */ 2362 /* 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); 2363 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); 2364 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); 2365 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 2366
2511 /* figure out which skill it uses, if it uses one */ 2367 /* figure out which skill it uses, if it uses one */
2512 if (spell->skill) 2368 if (spell->skill)
2513 { 2369 {
2514 for (i = 1; i < NUM_SKILLS; i++) 2370 for (i = 1; i < NUM_SKILLS; i++)
… …
2516 { 2372 {
2517 skill = i + CS_STAT_SKILLINFO; 2373 skill = i + CS_STAT_SKILLINFO;
2518 break; 2374 break;
2519 } 2375 }
2520 } 2376 }
2521 SockList_AddChar (sl, skill);
2522 2377
2523 SockList_AddInt (sl, spell->path_attuned); 2378 /* send the current values */
2379 sl << uint32 (spell->count)
2380 << uint16 (spell->level)
2381 << uint16 (spell->casting_time)
2382 << uint16 (spell->last_sp)
2383 << uint16 (spell->last_grace)
2384 << uint16 (spell->last_eat)
2385 << uint8 (skill)
2386 << uint32 (spell->path_attuned)
2524 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2387 << uint32 (spell->face ? spell->face->number : 0)
2525 2388 << data8 (spell->name)
2526 len = strlen (spell->name); 2389 << 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} 2390}
2543 2391
2544/** 2392/**
2545 * This tells the client to add the spell *ob, if *ob is NULL, then add 2393 * This tells the client to add the spell *ob, if *ob is NULL, then add
2546 * all spells in the player's inventory. 2394 * all spells in the player's inventory.
2547 */ 2395 */
2548void 2396void
2549esrv_add_spells (player *pl, object *spell) 2397esrv_add_spells (player *pl, object *spell)
2550{ 2398{
2551 SockList sl;
2552
2553 if (!pl) 2399 if (!pl)
2554 { 2400 {
2555 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2401 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2556 return; 2402 return;
2557 } 2403 }
2404
2558 if (!pl->socket.monitor_spells) 2405 if (!pl->socket->monitor_spells)
2559 return; 2406 return;
2560 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2407
2561 strcpy ((char *) sl.buf, "addspell "); 2408 packet sl;
2562 sl.len = strlen ((char *) sl.buf); 2409
2410 sl << "addspell ";
2411
2563 if (!spell) 2412 if (!spell)
2564 { 2413 {
2565 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2414 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2566 { 2415 {
2567 /* were we to simply keep appending data here, we could exceed 2416 /* 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 2426 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2578 * like it will fix this 2427 * like it will fix this
2579 */ 2428 */
2580 if (spell->type != SPELL) 2429 if (spell->type != SPELL)
2581 continue; 2430 continue;
2431
2582 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2432 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2583 { 2433 {
2584 Send_With_Handling (&pl->socket, &sl); 2434 Send_With_Handling (pl->socket, &sl);
2585 strcpy ((char *) sl.buf, "addspell "); 2435
2586 sl.len = strlen ((char *) sl.buf); 2436 sl.reset ();
2437 sl << "addspell ";
2587 } 2438 }
2439
2588 append_spell (pl, &sl, spell); 2440 append_spell (pl, sl, spell);
2589 } 2441 }
2590 } 2442 }
2591 else if (spell->type != SPELL) 2443 else if (spell->type != SPELL)
2592 { 2444 {
2593 LOG (llevError, "Asked to send a non-spell object as a spell"); 2445 LOG (llevError, "Asked to send a non-spell object as a spell");
2594 return; 2446 return;
2595 } 2447 }
2596 else 2448 else
2597 append_spell (pl, &sl, spell); 2449 append_spell (pl, sl, spell);
2450
2598 if (sl.len >= MAXSOCKBUF) 2451 if (sl.length () >= MAXSOCKBUF)
2599 { 2452 {
2600 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2453 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2601 fatal (0); 2454 fatal (0);
2602 } 2455 }
2456
2603 /* finally, we can send the packet */ 2457 /* finally, we can send the packet */
2604 Send_With_Handling (&pl->socket, &sl); 2458 Send_With_Handling (pl->socket, &sl);
2605 free (sl.buf);
2606} 2459}
2460

Diff Legend

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