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

Diff Legend

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