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

Diff Legend

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