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

Diff Legend

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