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

Diff Legend

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