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.50 by root, Thu Dec 21 23:37:06 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.
… …
44 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
45 * 39 *
46 * esrv_map_setbelow allows filling in all of the faces for the map. 40 * esrv_map_setbelow allows filling in all of the faces for the map.
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
50 * operations
51 *
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 */ 43 */
58 44
59#include <global.h> 45#include <global.h>
60#include <sproto.h> 46#include <sproto.h>
61 47
62#include <newclient.h>
63#include <newserver.h>
64#include <living.h> 48#include <living.h>
65#include <commands.h> 49#include <commands.h>
66 50
67/* This block is basically taken from socket.c - I assume if it works there, 51/* This block is basically taken from socket.c - I assume if it works there,
68 * it should work here. 52 * it should work here.
69 */ 53 */
70#ifndef WIN32 /* ---win32 exclude unix headers */
71# include <sys/types.h> 54#include <sys/types.h>
72# include <sys/time.h> 55#include <sys/time.h>
73# include <sys/socket.h> 56#include <sys/socket.h>
74# include <netinet/in.h> 57#include <netinet/in.h>
75# include <netdb.h> 58#include <netdb.h>
76#endif /* win32 */
77 59
78#ifdef HAVE_UNISTD_H
79# include <unistd.h> 60#include <unistd.h>
80#endif
81
82#ifdef HAVE_SYS_TIME_H
83# include <sys/time.h> 61#include <sys/time.h>
84#endif
85 62
86#include "sounds.h" 63#include "sounds.h"
87 64
88/** 65/**
89 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
… …
106 -1, /* life stealing */ 83 -1, /* life stealing */
107 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
108}; 85};
109 86
110static void 87static void
111socket_map_scroll (NewSocket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
112{ 89{
113 struct Map newmap; 90 struct Map newmap;
114 int x, y, mx, my; 91 int x, y, mx, my;
115 92
116 {
117 char buf[MAXSOCKBUF];
118
119 sprintf (buf, "map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
120 Write_String_To_Socket (ns, buf, strlen (buf));
121 }
122 94
123 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
124 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
125 * So set the mx,my to the max value we want to 97 * So set the mx,my to the max value we want to
126 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
145 for (x = 0; x < mx; x++) 117 for (x = 0; x < mx; x++)
146 { 118 {
147 for (y = 0; y < my; y++) 119 for (y = 0; y < my; y++)
148 { 120 {
149 if (x >= ns->mapx || y >= ns->mapy) 121 if (x >= ns->mapx || y >= ns->mapy)
150 {
151 /* clear cells outside the viewable area */ 122 /* clear cells outside the viewable area */
152 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 123 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) 124 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 */ 125 /* clear newly visible tiles within the viewable area */
157 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 126 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
158 }
159 else 127 else
160 {
161 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 128 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
162 }
163 } 129 }
164 } 130 }
165 131
166 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 132 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
167 133
… …
172} 138}
173 139
174static void 140static void
175clear_map (player *pl) 141clear_map (player *pl)
176{ 142{
177 NewSocket & socket = pl->socket;
178
179 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
180 144
181 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
182 Write_String_To_Socket (&socket, "newmap", 6); 146 pl->ns->send_packet ("newmap");
183 147
184 socket.update_look = 1; 148 pl->ns->floorbox_reset ();
185 socket.look_position = 0;
186} 149}
187 150
188/** check for map change and send new map data */ 151/** check for map change and send new map data */
189static void 152static void
190check_map_change (player *pl) 153check_map_change (player *pl)
191{ 154{
192 NewSocket & socket = pl->socket; 155 client &socket = *pl->ns;
193 object *ob = pl->ob; 156 object *ob = pl->ob;
194 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
195 158
196 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
197 { 160 {
… …
218 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
219 } 182 }
220 else 183 else
221 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
222 185
223 Write_String_To_Socket (&socket, buf, strlen (buf)); 186 socket.send_packet (buf);
224 } 187 }
225 } 188 }
226 else if (socket.current_x != ob->x || socket.current_y != ob->y) 189 else if (socket.current_x != ob->x || socket.current_y != ob->y)
227 { 190 {
228 int dx = ob->x - socket.current_x; 191 int dx = ob->x - socket.current_x;
… …
231 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
232 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
233 else 196 else
234 { 197 {
235 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
236 socket.update_look = 1; 199 socket.floorbox_reset ();
237 socket.look_position = 0;
238 } 200 }
239 } 201 }
240 202
241 socket.current_x = ob->x; 203 socket.current_x = ob->x;
242 socket.current_y = ob->y; 204 socket.current_y = ob->y;
243} 205}
244 206
207/**
208 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide
210 * that information.
211 */
212void
213RequestInfo (char *buf, int len, client * ns)
214{
215 char *params = NULL, *cp;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227
228 /* find the first space, make it null, and update the
229 * params pointer.
230 */
231 for (cp = buf; *cp != '\0'; cp++)
232 if (*cp == ' ')
233 {
234 *cp = '\0';
235 params = cp + 1;
236 break;
237 }
238
239 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params);
241 else if (!strcmp (buf, "image_sums"))
242 send_image_sums (ns, params);
243 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params);
247 else
248 ns->send_packet (bigbuf, len);
249}
250
245void 251void
246ExtCmd (char *buf, int len, player *pl) 252ExtCmd (char *buf, int len, player *pl)
247{ 253{
248 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
255}
256
257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
249} 261}
250 262
251void 263void
252MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
253{ 265{
… …
266 if (!strncmp (buf, "spatial ", 8)) 278 if (!strncmp (buf, "spatial ", 8))
267 { 279 {
268 buf += 8; 280 buf += 8;
269 281
270 // initial map and its origin 282 // initial map and its origin
271 mapstruct *map = pl->ob->map; 283 maptile *map = pl->ob->map;
272 sint16 dx, dy; 284 sint16 dx, dy;
273 int mapx = pl->socket.mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
274 int mapy = pl->socket.mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
275 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
276 288
277 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
278 { 290 {
279 int dir = *buf++; 291 int dir = *buf++;
… …
330 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
331 } 343 }
332 else 344 else
333 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
334 346
335 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 347 pl->ns->send_packet (bigbuf);
336} 348}
337 349
338/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
339void 351void
340SetUp (char *buf, int len, NewSocket * ns) 352SetUp (char *buf, int len, client * ns)
341{ 353{
342 int s, slen; 354 int s, slen;
343 char *cmd, *param, cmdback[HUGE_BUF]; 355 char *cmd, *param, cmdback[HUGE_BUF];
344 356
345 /* run through the cmds of setup 357 /* run through the cmds of setup
… …
347 * 359 *
348 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 360 * 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 361 * The client then must sort this out
350 */ 362 */
351 363
352 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 364 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
365
353 strcpy (cmdback, "setup"); 366 strcpy (cmdback, "setup");
354 for (s = 0; s < len;) 367 for (s = 0; s < len; )
355 { 368 {
356
357 cmd = &buf[s]; 369 cmd = &buf[s];
358 370
359 /* find the next space, and put a null there */ 371 /* find the next space, and put a null there */
360 for (; buf[s] && buf[s] != ' '; s++); 372 for (; buf[s] && buf[s] != ' '; s++)
373 ;
374
361 buf[s++] = 0; 375 buf[s++] = 0;
376
362 while (buf[s] == ' ') 377 while (buf[s] == ' ')
363 s++; 378 s++;
364 379
365 if (s >= len) 380 if (s >= len)
366 break; 381 break;
367 382
368 param = &buf[s]; 383 param = &buf[s];
369 384
370 for (; buf[s] && buf[s] != ' '; s++); 385 for (; buf[s] && buf[s] != ' '; s++)
386 ;
387
371 buf[s++] = 0; 388 buf[s++] = 0;
389
372 while (buf[s] == ' ') 390 while (buf[s] == ' ')
373 s++; 391 s++;
374 392
375 slen = strlen (cmdback); 393 slen = strlen (cmdback);
376 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 394 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
537 * report a failure to the client. 555 * report a failure to the client.
538 */ 556 */
539 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 557 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
540 } 558 }
541 } /* for processing all the setup commands */ 559 } /* for processing all the setup commands */
560
542 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 561 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
543 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 562 ns->send_packet (cmdback);
544} 563}
545 564
546/** 565/**
547 * The client has requested to be added to the game. 566 * 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. 567 * 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, 568 * 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. 569 * it either has to be here or init_sockets needs to be exported.
551 */ 570 */
552void 571void
553AddMeCmd (char *buf, int len, NewSocket * ns) 572AddMeCmd (char *buf, int len, client * ns)
554{ 573{
555 Settings oldsettings; 574 if (INVOKE_CLIENT (ADDME, ns))
575 return;
556 576
557 oldsettings = settings;
558 if (ns->status != Ns_Add || add_player (ns)) 577 if (ns->pl || add_player (ns))
559 { 578 ns->send_packet ("addme_failed");
560 Write_String_To_Socket (ns, "addme_failed", 12);
561 }
562 else 579 else
563 { 580 ns->send_packet ("addme_success");
564 /* Basically, the add_player copies the socket structure into
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;
574} 581}
575 582
576/** Reply to ExtendedInfos command */ 583/** Reply to ExtendedInfos command */
577void 584void
578ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 585ToggleExtendedInfos (char *buf, int len, client * ns)
579{ 586{
580 char cmdback[MAX_BUF]; 587 char cmdback[MAX_BUF];
581 char command[50]; 588 char command[50];
582 int info, nextinfo; 589 int info, nextinfo;
583 590
584 cmdback[0] = '\0'; 591 cmdback[0] = '\0';
585 nextinfo = 0; 592 nextinfo = 0;
593
586 while (1) 594 while (1)
587 { 595 {
588 /* 1. Extract an info */ 596 /* 1. Extract an info */
589 info = nextinfo; 597 info = nextinfo;
598
590 while ((info < len) && (buf[info] == ' ')) 599 while ((info < len) && (buf[info] == ' '))
591 info++; 600 info++;
601
592 if (info >= len) 602 if (info >= len)
593 break; 603 break;
604
594 nextinfo = info + 1; 605 nextinfo = info + 1;
606
595 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 607 while ((nextinfo < len) && (buf[nextinfo] != ' '))
596 nextinfo++; 608 nextinfo++;
609
597 if (nextinfo - info >= 49) /*Erroneous info asked */ 610 if (nextinfo - info >= 49) /*Erroneous info asked */
598 continue; 611 continue;
612
599 strncpy (command, &(buf[info]), nextinfo - info); 613 strncpy (command, &(buf[info]), nextinfo - info);
600 command[nextinfo - info] = '\0'; 614
601 /* 2. Interpret info */ 615 /* 2. Interpret info */
602 if (!strcmp ("smooth", command)) 616 if (!strcmp ("smooth", command))
603 {
604 /* Toggle smoothing */ 617 /* Toggle smoothing */
605 ns->EMI_smooth = !ns->EMI_smooth; 618 ns->EMI_smooth = !ns->EMI_smooth;
606 }
607 else 619 else
608 {
609 /*bad value */ 620 /*bad value */;
610 } 621
611 /*3. Next info */ 622 /*3. Next info */
612 } 623 }
624
613 strcpy (cmdback, "ExtendedInfoSet"); 625 strcpy (cmdback, "ExtendedInfoSet");
626
614 if (ns->EMI_smooth) 627 if (ns->EMI_smooth)
615 { 628 {
616 strcat (cmdback, " "); 629 strcat (cmdback, " ");
617 strcat (cmdback, "smoothing"); 630 strcat (cmdback, "smoothing");
618 } 631 }
619 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 632
633 ns->send_packet (cmdback);
620} 634}
621 635
622/* 636/*
623#define MSG_TYPE_BOOK 1 637#define MSG_TYPE_BOOK 1
624#define MSG_TYPE_CARD 2 638#define MSG_TYPE_CARD 2
… …
627#define MSG_TYPE_MONUMENT 5 641#define MSG_TYPE_MONUMENT 5
628#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 642#define MSG_TYPE_SCRIPTED_DIALOG 6*/
629 643
630/** Reply to ExtendedInfos command */ 644/** Reply to ExtendedInfos command */
631void 645void
632ToggleExtendedText (char *buf, int len, NewSocket * ns) 646ToggleExtendedText (char *buf, int len, client * ns)
633{ 647{
634 char cmdback[MAX_BUF]; 648 char cmdback[MAX_BUF];
635 char temp[10]; 649 char temp[10];
636 char command[50]; 650 char command[50];
637 int info, nextinfo, i, flag; 651 int info, nextinfo, i, flag;
638 652
639 cmdback[0] = '\0'; 653 cmdback[0] = '\0';
654
640 nextinfo = 0; 655 nextinfo = 0;
641 while (1) 656 while (1)
642 { 657 {
643 /* 1. Extract an info */ 658 /* 1. Extract an info */
644 info = nextinfo; 659 info = nextinfo;
660
645 while ((info < len) && (buf[info] == ' ')) 661 while ((info < len) && (buf[info] == ' '))
646 info++; 662 info++;
663
647 if (info >= len) 664 if (info >= len)
648 break; 665 break;
666
649 nextinfo = info + 1; 667 nextinfo = info + 1;
668
650 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 669 while ((nextinfo < len) && (buf[nextinfo] != ' '))
651 nextinfo++; 670 nextinfo++;
671
652 if (nextinfo - info >= 49) /*Erroneous info asked */ 672 if (nextinfo - info >= 49) /*Erroneous info asked */
653 continue; 673 continue;
674
654 strncpy (command, &(buf[info]), nextinfo - info); 675 strncpy (command, &(buf[info]), nextinfo - info);
655 command[nextinfo - info] = '\0'; 676 command[nextinfo - info] = '\0';
656 /* 2. Interpret info */ 677 /* 2. Interpret info */
657 i = sscanf (command, "%d", &flag); 678 i = sscanf (command, "%d", &flag);
679
658 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 680 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
659 ns->supported_readables |= (1 << flag); 681 ns->supported_readables |= (1 << flag);
660 /*3. Next info */ 682 /*3. Next info */
661 } 683 }
684
662 /* Send resulting state */ 685 /* Send resulting state */
663 strcpy (cmdback, "ExtendedTextSet"); 686 strcpy (cmdback, "ExtendedTextSet");
687
664 for (i = 0; i <= MSG_TYPE_LAST; i++) 688 for (i = 0; i <= MSG_TYPE_LAST; i++)
665 if (ns->supported_readables & (1 << i)) 689 if (ns->supported_readables & (1 << i))
666 { 690 {
667 strcat (cmdback, " "); 691 strcat (cmdback, " ");
668 snprintf (temp, sizeof (temp), "%d", i); 692 snprintf (temp, sizeof (temp), "%d", i);
669 strcat (cmdback, temp); 693 strcat (cmdback, temp);
670 } 694 }
671 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 695
696 ns->send_packet (cmdback);
672} 697}
673 698
674/** 699/**
675 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 700 * 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 701 * 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 702 * 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 703 * if we know the client wants it, might as well push it to the
679 * client. 704 * client.
680 */ 705 */
681static void 706static void
682SendSmooth (NewSocket * ns, uint16 face) 707SendSmooth (client *ns, uint16 face)
683{ 708{
684 uint16 smoothface; 709 uint16 smoothface;
685 unsigned char reply[MAX_BUF];
686 SockList sl;
687 710
688 /* If we can't find a face, return and set it so we won't try to send this 711 /* If we can't find a face, return and set it so we won't try to send this
689 * again. 712 * again.
690 */ 713 */
691 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 714 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 722 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
700 esrv_send_face (ns, smoothface, 0); 723 esrv_send_face (ns, smoothface, 0);
701 724
702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 725 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
703 726
704 sl.buf = reply; 727 packet sl ("smooth");
705 strcpy ((char *) sl.buf, "smooth "); 728
706 sl.len = strlen ((char *) sl.buf); 729 sl << uint16 (face)
707 SockList_AddShort (&sl, face); 730 << uint16 (smoothface);
708 SockList_AddShort (&sl, smoothface); 731
709 Send_With_Handling (ns, &sl); 732 ns->send_packet (sl);
710} 733}
711 734
712 /** 735 /**
713 * Tells client the picture it has to use 736 * Tells client the picture it has to use
714 * to smooth a picture number given as argument. 737 * to smooth a picture number given as argument.
715 */ 738 */
716void 739void
717AskSmooth (char *buf, int len, NewSocket * ns) 740AskSmooth (char *buf, int len, client *ns)
718{ 741{
719 uint16 facenbr; 742 SendSmooth (ns, atoi (buf));
720
721 facenbr = atoi (buf);
722 SendSmooth (ns, facenbr);
723} 743}
724
725
726
727
728 744
729/** 745/**
730 * This handles the general commands from the client (ie, north, fire, cast, 746 * This handles the general commands from the client (ie, north, fire, cast,
731 * etc.) 747 * etc.)
732 */ 748 */
733void 749void
734PlayerCmd (char *buf, int len, player *pl) 750PlayerCmd (char *buf, int len, player *pl)
735{ 751{
736
737 /* The following should never happen with a proper or honest client.
738 * Therefore, the error message doesn't have to be too clear - if
739 * someone is playing with a hacked/non working client, this gives them
740 * an idea of the problem, but they deserve what they get
741 */
742 if (pl->state != ST_PLAYING)
743 {
744 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
745 return;
746 }
747 /* Check if there is a count. In theory, a zero count could also be 752 /* Check if there is a count. In theory, a zero count could also be
748 * sent, so check for that also. 753 * sent, so check for that also.
749 */ 754 */
750 if (atoi (buf) || buf[0] == '0') 755 if (atoi (buf) || buf[0] == '0')
751 { 756 {
752 pl->count = atoi ((char *) buf); 757 pl->count = atoi ((char *) buf);
758
753 buf = strchr (buf, ' '); /* advance beyond the numbers */ 759 buf = strchr (buf, ' '); /* advance beyond the numbers */
754 if (!buf) 760 if (!buf)
755 {
756#ifdef ESRV_DEBUG
757 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
758#endif
759 return; 761 return;
760 } 762
761 buf++; 763 buf++;
762 } 764 }
763 /* This should not happen anymore. */ 765
764 if (pl->ob->speed_left < -1.0)
765 {
766 LOG (llevError, "Player has negative time - shouldn't do command.\n");
767 }
768 /* In c_new.c */
769 execute_newserver_command (pl->ob, (char *) buf); 766 execute_newserver_command (pl->ob, (char *) buf);
767
770 /* Perhaps something better should be done with a left over count. 768 /* Perhaps something better should be done with a left over count.
771 * Cleaning up the input should probably be done first - all actions 769 * Cleaning up the input should probably be done first - all actions
772 * for the command that issued the count should be done before any other 770 * for the command that issued the count should be done before any other
773 * commands. 771 * commands.
774 */ 772 */
775
776 pl->count = 0; 773 pl->count = 0;
777
778} 774}
779 775
780 776
781/** 777/**
782 * This handles the general commands from the client (ie, north, fire, cast, 778 * This handles the general commands from the client (ie, north, fire, cast,
783 * etc.). It is a lot like PlayerCmd above, but is called with the 779 * 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 780 * 'ncom' method which gives more information back to the client so it
785 * can throttle. 781 * can throttle.
786 */ 782 */
787void 783void
788NewPlayerCmd (uint8 * buf, int len, player *pl) 784NewPlayerCmd (char *buf, int len, player *pl)
789{ 785{
790 int time, repeat;
791 short packet;
792 unsigned char command[MAX_BUF];
793 SockList sl;
794
795 if (len < 7) 786 if (len <= 6)
796 { 787 {
797 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 788 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
798 return; 789 return;
799 } 790 }
800 791
801 packet = GetShort_String (buf); 792 uint16 cmdid = net_uint16 ((uint8 *)buf);
802 repeat = GetInt_String (buf + 2); 793 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
794
803 /* -1 is special - no repeat, but don't update */ 795 /* -1 is special - no repeat, but don't update */
804 if (repeat != -1) 796 if (repeat != -1)
805 {
806 pl->count = repeat; 797 pl->count = repeat;
807 }
808 if ((len - 4) >= MAX_BUF)
809 len = MAX_BUF - 5;
810 798
811 strncpy ((char *) command, (char *) buf + 6, len - 4); 799 buf += 6; //len -= 6;
812 command[len - 4] = '\0';
813 800
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
825 /* This should not happen anymore. */
826 if (pl->ob->speed_left < -1.0)
827 {
828 LOG (llevError, "Player has negative time - shouldn't do command.\n");
829 }
830 /* In c_new.c */
831 execute_newserver_command (pl->ob, (char *) command); 801 execute_newserver_command (pl->ob, buf);
802
832 /* Perhaps something better should be done with a left over count. 803 /* Perhaps something better should be done with a left over count.
833 * Cleaning up the input should probably be done first - all actions 804 * 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 805 * for the command that issued the count should be done before any other
835 * commands. 806 * commands.
836 */ 807 */
837 pl->count = 0; 808 pl->count = 0;
838 809
810 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
811 int time = FABS (pl->ob->speed) < 0.001
812 ? time = MAX_TIME * 100
813 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
814
839 /* Send confirmation of command execution now */ 815 /* Send confirmation of command execution now */
840 sl.buf = command; 816 packet sl ("comc");
841 strcpy ((char *) sl.buf, "comc "); 817 sl << uint16 (cmdid) << uint32 (time);
842 sl.len = 5; 818 pl->ns->send_packet (sl);
843 SockList_AddShort (&sl, packet);
844 if (FABS (pl->ob->speed) < 0.001)
845 time = MAX_TIME * 100;
846 else
847 time = (int) (MAX_TIME / FABS (pl->ob->speed));
848 SockList_AddInt (&sl, time);
849 Send_With_Handling (&pl->socket, &sl);
850} 819}
851
852 820
853/** This is a reply to a previous query. */ 821/** This is a reply to a previous query. */
854void 822void
855ReplyCmd (char *buf, int len, player *pl) 823ReplyCmd (char *buf, int len, client *ns)
856{ 824{
825 if (ns->state == ST_CUSTOM)
826 {
827 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
828 return;
829 }
830
831 if (!ns->pl)
832 return; //TODO: depends on the exact reply we are after
833 //TODO: but right now, we always have a ns->pl
834
835 player *pl = ns->pl;
836
857 /* This is to synthesize how the data would be stored if it 837 /* This is to synthesize how the data would be stored if it
858 * was normally entered. A bit of a hack, and should be cleaned up 838 * was normally entered. A bit of a hack, and should be cleaned up
859 * once all the X11 code is removed from the server. 839 * once all the X11 code is removed from the server.
860 * 840 *
861 * We pass 13 to many of the functions because this way they 841 * We pass 13 to many of the functions because this way they
862 * think it was the carriage return that was entered, and the 842 * think it was the carriage return that was entered, and the
863 * function then does not try to do additional input. 843 * function then does not try to do additional input.
864 */ 844 */
865 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 845 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
866 846
867 /* this avoids any hacking here */ 847 /* this avoids any hacking here */
868 848
869 switch (pl->state) 849 switch (ns->state)
870 { 850 {
871 case ST_PLAYING: 851 case ST_PLAYING:
872 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 852 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
873 break; 853 break;
874 854
875 case ST_PLAY_AGAIN: 855 case ST_PLAY_AGAIN:
876 /* We can check this for return value (2==quit). Maybe we 856 /* We can check this for return value (2==quit). Maybe we
877 * should, and do something appropriate? 857 * should, and do something appropriate?
878 */ 858 */
879 receive_play_again (pl->ob, buf[0]); 859 receive_play_again (pl->ob, buf[0]);
880 break; 860 break;
881 861
882 case ST_ROLL_STAT: 862 case ST_ROLL_STAT:
883 key_roll_stat (pl->ob, buf[0]); 863 key_roll_stat (pl->ob, buf[0]);
884 break; 864 break;
885 865
886 case ST_CHANGE_CLASS: 866 case ST_CHANGE_CLASS:
887
888 key_change_class (pl->ob, buf[0]); 867 key_change_class (pl->ob, buf[0]);
889 break; 868 break;
890 869
891 case ST_CONFIRM_QUIT: 870 case ST_CONFIRM_QUIT:
892 key_confirm_quit (pl->ob, buf[0]); 871 key_confirm_quit (pl->ob, buf[0]);
893 break; 872 break;
894 873
895 case ST_CONFIGURE: 874 case ST_CONFIGURE:
896 LOG (llevError, "In client input handling, but into configure state\n"); 875 LOG (llevError, "In client input handling, but into configure state\n");
897 pl->state = ST_PLAYING; 876 ns->state = ST_PLAYING;
898 break; 877 break;
899 878
900 case ST_GET_NAME: 879 case ST_GET_NAME:
901 receive_player_name (pl->ob, 13); 880 receive_player_name (pl->ob, 13);
902 break; 881 break;
903 882
904 case ST_GET_PASSWORD: 883 case ST_GET_PASSWORD:
905 case ST_CONFIRM_PASSWORD: 884 case ST_CONFIRM_PASSWORD:
906 receive_player_password (pl->ob, 13); 885 receive_player_password (pl->ob, 13);
907 break; 886 break;
908 887
909 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 888 case ST_GET_PARTY_PASSWORD: /* Get password for party */
910 receive_party_password (pl->ob, 13); 889 receive_party_password (pl->ob, 13);
911 break; 890 break;
912 891
913 default: 892 default:
914 LOG (llevError, "Unknown input state: %d\n", pl->state); 893 LOG (llevError, "Unknown input state: %d\n", ns->state);
915 } 894 }
916} 895}
917 896
918/** 897/**
919 * Client tells its version. If there is a mismatch, we close the 898 * Client tells its version. If there is a mismatch, we close the
… …
921 * something older than the server. If we assume the client will be 900 * 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 901 * backwards compatible, having it be a later version should not be a
923 * problem. 902 * problem.
924 */ 903 */
925void 904void
926VersionCmd (char *buf, int len, NewSocket * ns) 905VersionCmd (char *buf, int len, client * ns)
927{ 906{
928 char *cp;
929 char version_warning[256];
930
931 if (!buf) 907 if (!buf)
932 { 908 {
933 LOG (llevError, "CS: received corrupted version command\n"); 909 LOG (llevError, "CS: received corrupted version command\n");
934 return; 910 return;
935 } 911 }
936 912
937 ns->cs_version = atoi (buf); 913 ns->cs_version = atoi (buf);
938 ns->sc_version = ns->cs_version; 914 ns->sc_version = ns->cs_version;
915
916 LOG (llevDebug, "connection from client <%s>\n", buf);
917
918
919 //TODO: should log here just for statistics
920
939 if (VERSION_CS != ns->cs_version) 921 //if (VERSION_CS != ns->cs_version)
940 { 922 // unchecked;
941#ifdef ESRV_DEBUG 923
942 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
943#endif
944 }
945 cp = strchr (buf + 1, ' '); 924 char *cp = strchr (buf + 1, ' ');
946 if (!cp) 925 if (!cp)
947 return; 926 return;
927
948 ns->sc_version = atoi (cp); 928 ns->sc_version = atoi (cp);
929
949 if (VERSION_SC != ns->sc_version) 930 //if (VERSION_SC != ns->sc_version)
950 { 931 // unchecked;
951#ifdef ESRV_DEBUG 932
952 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
953#endif
954 }
955 cp = strchr (cp + 1, ' '); 933 cp = strchr (cp + 1, ' ');
934
956 if (cp) 935 if (cp)
957 { 936 {
958 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 937 assign (ns->version, cp + 1);
959 938
960 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 939 if (ns->sc_version < 1026)
961 940 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
962 /* This is first implementation - i skip all beta DX clients with it
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 {
973 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 941 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
975 Write_String_To_Socket (ns, version_warning, strlen (version_warning));
976 }
977
978 } 942 }
979} 943}
980 944
981/** sound related functions. */ 945/** sound related functions. */
982
983void 946void
984SetSound (char *buf, int len, NewSocket * ns) 947SetSound (char *buf, int len, client * ns)
985{ 948{
986 ns->sound = atoi (buf); 949 ns->sound = atoi (buf);
987} 950}
988 951
989/** client wants the map resent */ 952/** client wants the map resent */
990 953
991void 954void
992MapRedrawCmd (char *buf, int len, player *pl) 955MapRedrawCmd (char *buf, int len, player *pl)
993{ 956{
994
995/* This function is currently disabled; just clearing the map state results in 957/* This function is currently disabled; just clearing the map state results in
996 * display errors. It should clear the cache and send a newmap command. 958 * display errors. It should clear the cache and send a newmap command.
997 * Unfortunately this solution does not work because some client versions send 959 * Unfortunately this solution does not work because some client versions send
998 * a mapredraw command after receiving a newmap command. 960 * a mapredraw command after receiving a newmap command.
999 */ 961 */
1000#if 0
1001 /* Okay, this is MAJOR UGLY. but the only way I know how to
1002 * clear the "cache"
1003 */
1004 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1005 draw_client_map (pl->ob);
1006#endif
1007} 962}
1008 963
1009/** 964/**
1010 * Moves an object (typically, container to inventory). 965 * Moves an object (typically, container to inventory).
1011 * syntax is: move (to) (tag) (nrof) 966 * syntax is: move (to) (tag) (nrof)
… …
1014MoveCmd (char *buf, int len, player *pl) 969MoveCmd (char *buf, int len, player *pl)
1015{ 970{
1016 int vals[3], i; 971 int vals[3], i;
1017 972
1018 /* A little funky here. We only cycle for 2 records, because 973 /* A little funky here. We only cycle for 2 records, because
1019 * we obviously am not going to find a space after the third 974 * we obviously are not going to find a space after the third
1020 * record. Perhaps we should just replace this with a 975 * record. Perhaps we should just replace this with a
1021 * sscanf? 976 * sscanf?
1022 */ 977 */
1023 for (i = 0; i < 2; i++) 978 for (i = 0; i < 2; i++)
1024 { 979 {
1025 vals[i] = atoi (buf); 980 vals[i] = atoi (buf);
981
1026 if (!(buf = strchr (buf, ' '))) 982 if (!(buf = strchr (buf, ' ')))
1027 { 983 {
1028 LOG (llevError, "Incomplete move command: %s\n", buf); 984 LOG (llevError, "Incomplete move command: %s\n", buf);
1029 return; 985 return;
1030 } 986 }
987
1031 buf++; 988 buf++;
1032 } 989 }
990
1033 vals[2] = atoi (buf); 991 vals[2] = atoi (buf);
1034 992
1035/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 993/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1036 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 994 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1037} 995}
1038
1039
1040 996
1041/****************************************************************************** 997/******************************************************************************
1042 * 998 *
1043 * Start of commands the server sends to the client. 999 * Start of commands the server sends to the client.
1044 * 1000 *
… …
1047/** 1003/**
1048 * Asks the client to query the user. This way, the client knows 1004 * 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) 1005 * it needs to send something back (vs just printing out a message)
1050 */ 1006 */
1051void 1007void
1052send_query (NewSocket * ns, uint8 flags, char *text) 1008send_query (client *ns, uint8 flags, char *text)
1053{ 1009{
1054 char buf[MAX_BUF];
1055
1056 sprintf (buf, "query %d %s", flags, text ? text : ""); 1010 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1057 Write_String_To_Socket (ns, buf, strlen (buf));
1058} 1011}
1059 1012
1060#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1013#define AddIfInt64(Old,New,Type) if (Old != New) {\
1061 Old = New; \ 1014 Old = New; \
1062 SockList_AddChar(&sl, Type); \ 1015 sl << uint8 (Type) << uint64 (New); \
1063 SockList_AddInt64(&sl, New); \
1064 } 1016 }
1065 1017
1066#define AddIfInt(Old,New,Type) if (Old != New) {\ 1018#define AddIfInt(Old,New,Type) if (Old != New) {\
1067 Old = New; \ 1019 Old = New; \
1068 SockList_AddChar(&sl, Type); \ 1020 sl << uint8 (Type) << uint32 (New); \
1069 SockList_AddInt(&sl, New); \
1070 } 1021 }
1071 1022
1072#define AddIfShort(Old,New,Type) if (Old != New) {\ 1023#define AddIfShort(Old,New,Type) if (Old != New) {\
1073 Old = New; \ 1024 Old = New; \
1074 SockList_AddChar(&sl, Type); \ 1025 sl << uint8 (Type) << uint16 (New); \
1075 SockList_AddShort(&sl, New); \
1076 } 1026 }
1077 1027
1078#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1028#define AddIfFloat(Old,New,Type) if (Old != New) {\
1079 Old = New; \ 1029 Old = New; \
1080 SockList_AddChar(&sl, Type); \ 1030 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1081 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1082 } 1031 }
1083 1032
1084#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1033#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1085 if (Old) free(Old);\
1086 Old = strdup_local(New);\ 1034 free(Old); Old = strdup (New);\
1087 SockList_AddChar(&sl, Type); \ 1035 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 } 1036 }
1092 1037
1093/** 1038/**
1094 * Sends a statistics update. We look at the old values, 1039 * Sends a statistics update. We look at the old values,
1095 * and only send what has changed. Stat mapping values are in newclient.h 1040 * and only send what has changed. Stat mapping values are in newclient.h
… …
1097 * commands for now. 1042 * commands for now.
1098 */ 1043 */
1099void 1044void
1100esrv_update_stats (player *pl) 1045esrv_update_stats (player *pl)
1101{ 1046{
1102 SockList sl;
1103 char buf[MAX_BUF]; 1047 char buf[MAX_BUF];
1104 uint16 flags; 1048 uint16 flags;
1105 1049
1106 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1050 packet sl ("stats");
1107 strcpy ((char *) sl.buf, "stats ");
1108 sl.len = strlen ((char *) sl.buf);
1109 1051
1110 if (pl->ob != NULL) 1052 if (pl->ob)
1111 { 1053 {
1112 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1054 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); 1055 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1114 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1056 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1115 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1057 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
… …
1121 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1063 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); 1064 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); 1065 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); 1066 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1125 } 1067 }
1068
1126 if (pl->socket.exp64) 1069 if (pl->ns->exp64)
1127 {
1128 uint8 s;
1129
1130 for (s = 0; s < NUM_SKILLS; s++) 1070 for (int s = 0; s < NUM_SKILLS; s++)
1131 {
1132 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1071 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1133 { 1072 {
1134
1135 /* Always send along the level if exp changes. This is only 1073 /* Always send along the level if exp changes. This is only
1136 * 1 extra byte, but keeps processing simpler. 1074 * 1 extra byte, but keeps processing simpler.
1137 */ 1075 */
1138 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1076 sl << uint8 (s + CS_STAT_SKILLINFO)
1139 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1077 << uint8 (pl->last_skill_ob[s]->level)
1140 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1078 << uint64 (pl->last_skill_ob[s]->stats.exp);
1079
1141 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1080 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1142 } 1081 }
1143 } 1082
1144 }
1145 if (pl->socket.exp64) 1083 if (pl->ns->exp64)
1146 {
1147 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1084 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1148 }
1149 else 1085 else
1150 {
1151 AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP); 1086 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1152 } 1087
1153 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1088 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1154 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1089 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); 1090 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); 1091 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1157 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1092 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1158 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1093 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); 1094 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); 1095 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1161 flags = 0; 1096 flags = 0;
1097
1162 if (pl->fire_on) 1098 if (pl->fire_on)
1163 flags |= SF_FIREON; 1099 flags |= SF_FIREON;
1100
1164 if (pl->run_on) 1101 if (pl->run_on)
1165 flags |= SF_RUNON; 1102 flags |= SF_RUNON;
1166 1103
1167 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1104 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1105
1168 if (pl->socket.sc_version < 1025) 1106 if (pl->ns->sc_version < 1025)
1169 {
1170 AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1107 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1171 }
1172 else 1108 else
1173 {
1174 int i;
1175
1176 for (i = 0; i < NROFATTACKS; i++) 1109 for (int i = 0; i < NROFATTACKS; i++)
1177 { 1110 {
1178 /* Skip ones we won't send */ 1111 /* Skip ones we won't send */
1179 if (atnr_cs_stat[i] == -1) 1112 if (atnr_cs_stat[i] == -1)
1180 continue; 1113 continue;
1114
1181 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1115 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1182 } 1116 }
1183 } 1117
1184 if (pl->socket.monitor_spells) 1118 if (pl->ns->monitor_spells)
1185 { 1119 {
1186 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1120 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); 1121 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); 1122 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1189 } 1123 }
1124
1190 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1125 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); 1126 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1192 set_title (pl->ob, buf); 1127 set_title (pl->ob, buf);
1193 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1128 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1194 1129
1195 /* Only send it away if we have some actual data */ 1130 /* Only send it away if we have some actual data */
1196 if (sl.len > 6) 1131 if (sl.length () > 6)
1197 { 1132 pl->ns->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} 1133}
1205
1206 1134
1207/** 1135/**
1208 * Tells the client that here is a player it should start using. 1136 * Tells the client that here is a player it should start using.
1209 */ 1137 */
1210void 1138void
1211esrv_new_player (player *pl, uint32 weight) 1139esrv_new_player (player *pl, uint32 weight)
1212{ 1140{
1213 SockList sl;
1214
1215 pl->last_weight = weight; 1141 pl->last_weight = weight;
1216 1142
1217 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1143 packet sl ("player");
1218 1144
1219 strcpy ((char *) sl.buf, "player "); 1145 sl << uint32 (pl->ob->count)
1220 sl.len = strlen ((char *) sl.buf); 1146 << uint32 (weight)
1221 SockList_AddInt (&sl, pl->ob->count); 1147 << uint32 (pl->ob->face->number)
1222 SockList_AddInt (&sl, weight); 1148 << data8 (pl->ob->name);
1223 SockList_AddInt (&sl, pl->ob->face->number);
1224 1149
1225 SockList_AddChar (&sl, (char) strlen (pl->ob->name)); 1150 pl->ns->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); 1151 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1232} 1152}
1233
1234 1153
1235/** 1154/**
1236 * Need to send an animation sequence to the client. 1155 * Need to send an animation sequence to the client.
1237 * We will send appropriate face commands to the client if we haven't 1156 * 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 1157 * 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 1158 * how much we are sending - on the other hand, this should only happen
1240 * when the player logs in and picks stuff up. 1159 * when the player logs in and picks stuff up.
1241 */ 1160 */
1242void 1161void
1243esrv_send_animation (NewSocket * ns, short anim_num) 1162esrv_send_animation (client * ns, short anim_num)
1244{ 1163{
1245 SockList sl;
1246 int i;
1247
1248 /* Do some checking on the anim_num we got. Note that the animations 1164 /* 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 1165 * are added in contigous order, so if the number is in the valid
1250 * range, it must be a valid animation. 1166 * range, it must be a valid animation.
1251 */ 1167 */
1252 if (anim_num < 0 || anim_num > num_animations) 1168 if (anim_num < 0 || anim_num > num_animations)
1253 { 1169 {
1254 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1170 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1255 return; 1171 return;
1256 } 1172 }
1257 1173
1258 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1174 packet sl ("anim");
1259 strcpy ((char *) sl.buf, "anim "); 1175
1260 sl.len = 5; 1176 sl << uint16 (anim_num)
1261 SockList_AddShort (&sl, anim_num); 1177 << uint16 (0); /* flags - not used right now */
1262 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1178
1263 /* Build up the list of faces. Also, send any information (ie, the 1179 /* Build up the list of faces. Also, send any information (ie, the
1264 * the face itself) down to the client. 1180 * the face itself) down to the client.
1265 */ 1181 */
1266 for (i = 0; i < animations[anim_num].num_animations; i++) 1182 for (int i = 0; i < animations[anim_num].num_animations; i++)
1267 { 1183 {
1268 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1184 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1269 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1185 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1186
1270 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1187 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1271 } 1188 }
1272 Send_With_Handling (ns, &sl); 1189
1273 free (sl.buf); 1190 ns->send_packet (sl);
1191
1274 ns->anims_sent[anim_num] = 1; 1192 ns->anims_sent[anim_num] = 1;
1275} 1193}
1276 1194
1277 1195
1278/****************************************************************************** 1196/******************************************************************************
… …
1284/** 1202/**
1285 * This adds face_num to a map cell at x,y. If the client doesn't have 1203 * 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. 1204 * the face yet, we will also send it.
1287 */ 1205 */
1288static void 1206static void
1289esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1207esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1290{ 1208{
1291 if (newmap->cells[x][y].count >= MAP_LAYERS) 1209 if (newmap->cells[x][y].count >= MAP_LAYERS)
1292 { 1210 {
1211 //TODO: one or the other, can't both have abort and return, verify and act
1293 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1212 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1294 return; 1213 return;
1295 abort (); 1214 abort ();
1296 } 1215 }
1216
1297 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1217 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1298 newmap->cells[x][y].count++; 1218 newmap->cells[x][y].count++;
1219
1299 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1220 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1300 esrv_send_face (ns, face_num, 0); 1221 esrv_send_face (ns, face_num, 0);
1301} 1222}
1302
1303struct LayerCell
1304{
1305 uint16 xy;
1306 short face;
1307};
1308
1309struct MapLayer
1310{
1311 int count;
1312 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1313};
1314
1315/** Checkes if map cells have changed */
1316static int
1317mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1318{
1319 int k;
1320
1321 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1322 return 1;
1323 for (k = 0; k < newmap->cells[i][j].count; k++)
1324 {
1325 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1326 {
1327 return 1;
1328 }
1329 }
1330 return 0;
1331}
1332
1333/**
1334 * Basically, what this does is pack the data into layers.
1335 * 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
1337 * how many layers of data we should back.
1338 */
1339static uint8 *
1340compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1341{
1342 int x, y, k;
1343 int face;
1344 unsigned char *fcur;
1345 struct MapLayer layers[MAP_LAYERS];
1346
1347 for (k = 0; k < MAP_LAYERS; k++)
1348 layers[k].count = 0;
1349 fcur = cur;
1350 for (x = 0; x < ns->mapx; x++)
1351 {
1352 for (y = 0; y < ns->mapy; y++)
1353 {
1354 if (!mapcellchanged (ns, x, y, newmap))
1355 continue;
1356 if (newmap->cells[x][y].count == 0)
1357 {
1358 *cur = x * ns->mapy + y; /* mark empty space */
1359 cur++;
1360 continue;
1361 }
1362 for (k = 0; k < newmap->cells[x][y].count; k++)
1363 {
1364 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1365 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1366 layers[k].count++;
1367 }
1368 }
1369 }
1370 /* If no data, return now. */
1371 if (fcur == cur && layers[0].count == 0)
1372 return cur;
1373 *cur = 255; /* mark end of explicitly cleared cells */
1374 cur++;
1375 /* First pack by layers. */
1376 for (k = 0; k < numlayers; k++)
1377 {
1378 if (layers[k].count == 0)
1379 break; /* once a layer is entirely empty, no layer below it can
1380 have anything in it either */
1381 /* Pack by entries in thie layer */
1382 for (x = 0; x < layers[k].count;)
1383 {
1384 fcur = cur;
1385 *cur = layers[k].lcells[x].face >> 8;
1386 cur++;
1387 *cur = layers[k].lcells[x].face & 0xFF;
1388 cur++;
1389 face = layers[k].lcells[x].face;
1390 /* Now, we back the redundant data into 1 byte xy pairings */
1391 for (y = x; y < layers[k].count; y++)
1392 {
1393 if (layers[k].lcells[y].face == face)
1394 {
1395 *cur = (uint8) layers[k].lcells[y].xy;
1396 cur++;
1397 layers[k].lcells[y].face = -1;
1398 }
1399 }
1400 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1401 /* forward over the now redundant data */
1402 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1403 x++;
1404 }
1405 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1406 }
1407 return cur;
1408}
1409
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 1223
1446/** Clears a map cell */ 1224/** Clears a map cell */
1447static void 1225static void
1448map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1226map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1449{ 1227{
1450 cell->faces[0] = face0; 1228 cell->faces[0] = face0;
1451 cell->faces[1] = face1; 1229 cell->faces[1] = face1;
1452 cell->faces[2] = face2; 1230 cell->faces[2] = face2;
1453 cell->count = count; 1231 cell->count = count;
1454 cell->stat_hp = 0; 1232 cell->stat_hp = 0;
1233 cell->flags = 0;
1455 cell->player = 0; 1234 cell->player = 0;
1456} 1235}
1457 1236
1458#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1237#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1459#define MAX_LAYERS 3 1238#define MAX_LAYERS 3
1460 1239
1461/* Using a global really isn't a good approach, but saves the over head of 1240/* Using a global really isn't a good approach, but saves the over head of
1462 * allocating and deallocating such a block of data each time run through, 1241 * allocating and deallocating such a block of data each time run through,
1463 * and saves the space of allocating this in the socket object when we only 1242 * and saves the space of allocating this in the socket object when we only
1464 * need it for this cycle. If the serve is ever threaded, this needs to be 1243 * need it for this cycle. If the server is ever threaded, this needs to be
1465 * re-examined. 1244 * re-examined.
1466 */ 1245 */
1467
1468static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1246static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1469 1247
1470/** 1248/**
1471 * Returns true if any of the heads for this 1249 * Returns true if any of the heads for this
1472 * space is set. Returns false if all are blank - this is used 1250 * space is set. Returns false if all are blank - this is used
1473 * for empty space checking. 1251 * for empty space checking.
1474 */ 1252 */
1475static inline int 1253static inline int
1476have_head (int ax, int ay) 1254have_head (int ax, int ay)
1477{ 1255{
1478
1479 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1256 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1480 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1257 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1481 return 1; 1258 return 1;
1259
1482 return 0; 1260 return 0;
1483} 1261}
1484 1262
1485/** 1263/**
1486 * check_head is a bit simplistic version of update_space below. 1264 * check_head is a bit simplistic version of update_space below.
1487 * basically, it only checks the that the head on space ax,ay at layer 1265 * basically, it only checks the that the head on space ax,ay at layer
1488 * needs to get sent - if so, it adds the data, sending the head 1266 * 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 1267 * if needed, and returning 1. If this no data needs to get
1490 * sent, it returns zero. 1268 * sent, it returns zero.
1491 */ 1269 */
1492static int 1270static int
1493check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1271check_head (packet &sl, client &ns, int ax, int ay, int layer)
1494{ 1272{
1495 short face_num; 1273 short face_num;
1496 1274
1497 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1275 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1498 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1276 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1499 else 1277 else
1500 face_num = 0; 1278 face_num = 0;
1501 1279
1502 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1280 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1503 { 1281 {
1504 SockList_AddShort (&sl, face_num); 1282 sl << uint16 (face_num);
1505 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1283 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1506 esrv_send_face (&ns, face_num, 0); 1284 esrv_send_face (&ns, face_num, 0);
1285
1507 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1286 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1508 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1287 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1509 return 1; 1288 return 1;
1510 } 1289 }
1511 1290
… …
1529 * numbers the spaces differently - I think this was a leftover from 1308 * numbers the spaces differently - I think this was a leftover from
1530 * the map command, where the faces stack up. Sinces that is no longer 1309 * the map command, where the faces stack up. Sinces that is no longer
1531 * the case, it seems to make more sense to have these layer values 1310 * the case, it seems to make more sense to have these layer values
1532 * actually match. 1311 * actually match.
1533 */ 1312 */
1534
1535static int 1313static int
1536update_space (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1314update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1537{ 1315{
1538 object *ob, *head; 1316 object *ob, *head;
1539 uint16 face_num; 1317 uint16 face_num;
1540 int bx, by, i; 1318 int bx, by, i;
1541 1319
1542 /* If there is a multipart object stored away, treat that as more important. 1320 /* If there is a multipart object stored away, treat that as more important.
1543 * If not, then do the normal processing. 1321 * If not, then do the normal processing.
1544 */ 1322 */
1545
1546 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1323 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1547 1324
1548 /* Check to see if this head is part of the set of objects 1325 /* Check to see if this head is part of the set of objects
1549 * we would normally send for this space. If so, then 1326 * we would normally send for this space. If so, then
1550 * don't use the head value. We need to do the check 1327 * don't use the head value. We need to do the check
… …
1715 1492
1716 /* Another hack - because of heads and whatnot, this face may match one 1493 /* 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 1494 * we already sent for a lower layer. In that case, don't send
1718 * this one. 1495 * this one.
1719 */ 1496 */
1720 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) 1497 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1721 {
1722 face_num = 0; 1498 face_num = 0;
1723 }
1724 1499
1725 /* We've gotten what face we want to use for the object. Now see if 1500 /* 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. 1501 * if it has changed since we last sent it to the client.
1727 */ 1502 */
1728 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1503 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1729 { 1504 {
1730 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1505 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1731 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1506 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1732 esrv_send_face (ns, face_num, 0); 1507 esrv_send_face (&ns, face_num, 0);
1733 SockList_AddShort (sl, face_num); 1508
1509 sl << uint16 (face_num);
1734 return 1; 1510 return 1;
1735 } 1511 }
1512
1736 /* Nothing changed */ 1513 /* Nothing changed */
1737 return 0; 1514 return 0;
1738} 1515}
1739 1516
1740/** 1517/**
… …
1755 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1532 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1756 * take. 1533 * take.
1757 */ 1534 */
1758 1535
1759static inline int 1536static inline int
1760update_smooth (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1537update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1761{ 1538{
1762 object *ob; 1539 object *ob;
1763 int smoothlevel; /* old face_num; */ 1540 int smoothlevel; /* old face_num; */
1764 1541
1765 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1542 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1770 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1547 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1771 smoothlevel = 0; 1548 smoothlevel = 0;
1772 else 1549 else
1773 { 1550 {
1774 smoothlevel = ob->smoothlevel; 1551 smoothlevel = ob->smoothlevel;
1775 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1552 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1776 SendSmooth (ns, ob->face->number); 1553 SendSmooth (&ns, ob->face->number);
1777 } /* else not already head object or blank face */ 1554 } /* else not already head object or blank face */
1778 1555
1779 /* We've gotten what face we want to use for the object. Now see if 1556 /* 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. 1557 * if it has changed since we last sent it to the client.
1781 */ 1558 */
1782 if (smoothlevel > 255) 1559 if (smoothlevel > 255)
1783 smoothlevel = 255; 1560 smoothlevel = 255;
1784 else if (smoothlevel < 0) 1561 else if (smoothlevel < 0)
1785 smoothlevel = 0; 1562 smoothlevel = 0;
1563
1786 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1564 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1787 { 1565 {
1788 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1566 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1789 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1567 sl << uint8 (smoothlevel);
1790 return 1; 1568 return 1;
1791 } 1569 }
1570
1792 /* Nothing changed */ 1571 /* Nothing changed */
1793 return 0; 1572 return 0;
1794} 1573}
1795 1574
1796/** 1575/**
1797 * Returns the size of a data for a map square as returned by 1576 * Returns the size of a data for a map square as returned by
1798 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1577 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1799 * available. 1578 * available.
1800 */ 1579 */
1801int 1580int
1802getExtendedMapInfoSize (NewSocket * ns) 1581getExtendedMapInfoSize (client * ns)
1803{ 1582{
1804 int result = 0; 1583 int result = 0;
1805 1584
1806 if (ns->ext_mapinfos) 1585 if (ns->ext_mapinfos)
1807 { 1586 {
1808 if (ns->EMI_smooth) 1587 if (ns->EMI_smooth)
1809 result += 1; /*One byte for smoothlevel */ 1588 result += 1; /*One byte for smoothlevel */
1810 } 1589 }
1590
1811 return result; 1591 return result;
1812} 1592}
1813 1593
1814/** 1594/**
1815 * This function uses the new map1 protocol command to send the map 1595 * This function uses the new map1 protocol command to send the map
… …
1822 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1602 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1823 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1603 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1824 * and use the other 4 bits for other informatiion. For full documentation 1604 * and use the other 4 bits for other informatiion. For full documentation
1825 * of what we send, see the doc/Protocol file. 1605 * of what we send, see the doc/Protocol file.
1826 * I will describe internally what we do: 1606 * I will describe internally what we do:
1827 * the socket->lastmap shows how the map last looked when sent to the client. 1607 * the ns->lastmap shows how the map last looked when sent to the client.
1828 * in the lastmap structure, there is a cells array, which is set to the 1608 * in the lastmap structure, there is a cells array, which is set to the
1829 * maximum viewable size (As set in config.h). 1609 * maximum viewable size (As set in config.h).
1830 * in the cells, there are faces and a count value. 1610 * in the cells, there are faces and a count value.
1831 * we use the count value to hold the darkness value. If -1, then this space 1611 * we use the count value to hold the darkness value. If -1, then this space
1832 * is not viewable. 1612 * is not viewable.
… …
1837draw_client_map1 (object *pl) 1617draw_client_map1 (object *pl)
1838{ 1618{
1839 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1619 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1840 sint16 nx, ny; 1620 sint16 nx, ny;
1841 int estartlen, eoldlen; 1621 int estartlen, eoldlen;
1842 SockList sl;
1843 SockList esl; /*For extended Map info */
1844 uint16 mask, emask; 1622 uint16 mask, emask;
1845 uint8 eentrysize; 1623 uint8 eentrysize;
1846 uint16 ewhatstart, ewhatflag; 1624 uint16 ewhatstart, ewhatflag;
1847 uint8 extendedinfos; 1625 uint8 extendedinfos;
1848 mapstruct *m; 1626 maptile *m;
1849 1627
1850 NewSocket & socket = pl->contr->socket; 1628 client &socket = *pl->contr->ns;
1851 1629
1852 check_map_change (pl->contr); 1630 check_map_change (pl->contr);
1853 1631
1854 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1632 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1855 if (socket.mapmode == Map1Cmd) 1633 packet esl;
1856 strcpy ((char *) sl.buf, "map1 "); 1634
1857 else
1858 strcpy ((char *) sl.buf, "map1a ");
1859 sl.len = strlen ((char *) sl.buf);
1860 startlen = sl.len; 1635 startlen = sl.length ();
1636
1861 /*Extendedmapinfo structure initialisation */ 1637 /*Extendedmapinfo structure initialisation */
1862 if (socket.ext_mapinfos) 1638 if (socket.ext_mapinfos)
1863 { 1639 {
1864 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1865 strcpy ((char *) esl.buf, "mapextended ");
1866 esl.len = strlen ((char *) esl.buf);
1867 extendedinfos = EMI_NOREDRAW; 1640 extendedinfos = EMI_NOREDRAW;
1641
1868 if (socket.EMI_smooth) 1642 if (socket.EMI_smooth)
1869 extendedinfos |= EMI_SMOOTH; 1643 extendedinfos |= EMI_SMOOTH;
1644
1870 ewhatstart = esl.len; 1645 ewhatstart = esl.length ();
1871 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1646 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1872 could need to be taken away */ 1647 could need to be taken away */
1873 SockList_AddChar (&esl, extendedinfos);
1874 eentrysize = getExtendedMapInfoSize (&socket); 1648 eentrysize = getExtendedMapInfoSize (&socket);
1875 SockList_AddChar (&esl, eentrysize); 1649 esl << "mapextended "
1650 << uint8 (extendedinfos)
1651 << uint8 (eentrysize);
1652
1876 estartlen = esl.len; 1653 estartlen = esl.length ();
1877 } 1654 }
1878 else 1655 else
1879 { 1656 {
1880 /* suppress compiler warnings */ 1657 /* suppress compiler warnings */
1881 ewhatstart = 0; 1658 ewhatstart = 0;
1882 ewhatflag = 0; 1659 ewhatflag = 0;
1883 estartlen = 0; 1660 estartlen = 0;
1884 } 1661 }
1662
1885 /* Init data to zero */ 1663 /* Init data to zero */
1886 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1664 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1887 1665
1888 /* x,y are the real map locations. ax, ay are viewport relative 1666 /* x,y are the real map locations. ax, ay are viewport relative
1889 * locations. 1667 * locations.
… …
1893 /* We could do this logic as conditionals in the if statement, 1671 /* We could do this logic as conditionals in the if statement,
1894 * but that started to get a bit messy to look at. 1672 * but that started to get a bit messy to look at.
1895 */ 1673 */
1896 max_x = pl->x + (socket.mapx + 1) / 2; 1674 max_x = pl->x + (socket.mapx + 1) / 2;
1897 max_y = pl->y + (socket.mapy + 1) / 2; 1675 max_y = pl->y + (socket.mapy + 1) / 2;
1676
1898 if (socket.mapmode == Map1aCmd) 1677 if (socket.mapmode == Map1aCmd)
1899 { 1678 {
1900 max_x += MAX_HEAD_OFFSET; 1679 max_x += MAX_HEAD_OFFSET;
1901 max_y += MAX_HEAD_OFFSET; 1680 max_y += MAX_HEAD_OFFSET;
1902 } 1681 }
… …
1904 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1683 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1905 { 1684 {
1906 ax = 0; 1685 ax = 0;
1907 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1686 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1908 { 1687 {
1909
1910 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1688 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1911 1689
1912 /* If this space is out of the normal viewable area, we only check 1690 /* If this space is out of the normal viewable area, we only check
1913 * the heads value ax or ay will only be greater than what 1691 * the heads value ax or ay will only be greater than what
1914 * the client wants if using the map1a command - this is because 1692 * the client wants if using the map1a command - this is because
… …
1917 */ 1695 */
1918 if (ax >= socket.mapx || ay >= socket.mapy) 1696 if (ax >= socket.mapx || ay >= socket.mapy)
1919 { 1697 {
1920 int i, got_one; 1698 int i, got_one;
1921 1699
1922 oldlen = sl.len; 1700 oldlen = sl.length ();
1923 1701
1924 SockList_AddShort (&sl, mask); 1702 sl << uint16 (mask);
1925 1703
1926 if (check_head (sl, socket, ax, ay, 2)) 1704 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1927 mask |= 0x4;
1928 if (check_head (sl, socket, ax, ay, 1)) 1705 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1929 mask |= 0x2;
1930 if (check_head (sl, socket, ax, ay, 0)) 1706 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1931 mask |= 0x1;
1932 1707
1933 /* If all we are doing is sending 0 (blank) faces, we don't 1708 /* If all we are doing is sending 0 (blank) faces, we don't
1934 * actually need to send that - just the coordinates 1709 * actually need to send that - just the coordinates
1935 * with no faces tells the client to blank out the 1710 * with no faces tells the client to blank out the
1936 * space. 1711 * space.
1937 */ 1712 */
1938 got_one = 0; 1713 got_one = 0;
1939 for (i = oldlen + 2; i < sl.len; i++) 1714 for (i = oldlen + 2; i < sl.length (); i++)
1940 {
1941 if (sl.buf[i]) 1715 if (sl[i])
1942 got_one = 1; 1716 got_one = 1;
1943 }
1944 1717
1945 if (got_one && (mask & 0xf)) 1718 if (got_one && (mask & 0xf))
1946 {
1947 sl.buf[oldlen + 1] = mask & 0xff; 1719 sl[oldlen + 1] = mask & 0xff;
1948 }
1949 else 1720 else
1950 { /*either all faces blank, either no face at all */ 1721 { /*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 */ 1722 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1952 sl.len = oldlen + 2; 1723 sl.reset (oldlen + 2);
1953 else 1724 else
1954 sl.len = oldlen; 1725 sl.reset (oldlen);
1955 } 1726 }
1727
1956 /*What concerns extendinfos, nothing to be done for now 1728 /*What concerns extendinfos, nothing to be done for now
1957 * (perhaps effects layer later) 1729 * (perhaps effects layer later)
1958 */ 1730 */
1959 continue; /* don't do processing below */ 1731 continue; /* don't do processing below */
1960 } 1732 }
1961 1733
1962 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1734 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1963 1735
1964 d = pl->contr->blocked_los[ax][ay]; 1736 d = pl->contr->blocked_los[ax][ay];
1965 1737
1966 /* If the coordinates are not valid, or it is too dark to see, 1738 /* If the coordinates are not valid, or it is too dark to see,
1967 * we tell the client as such 1739 * we tell the client as such
1968 */ 1740 */
1969 nx = x; 1741 nx = x;
1970 ny = y; 1742 ny = y;
1971 m = get_map_from_coord (pl->map, &nx, &ny); 1743 m = get_map_from_coord (pl->map, &nx, &ny);
1744
1972 if (!m) 1745 if (!m)
1973 { 1746 {
1974 /* space is out of map. Update space and clear values 1747 /* space is out of map. Update space and clear values
1975 * if this hasn't already been done. If the space is out 1748 * if this hasn't already been done. If the space is out
1976 * of the map, it shouldn't have a head 1749 * of the map, it shouldn't have a head
1977 */ 1750 */
1978 if (lastcell.count != -1) 1751 if (lastcell.count != -1)
1979 { 1752 {
1980 SockList_AddShort (&sl, mask); 1753 sl << uint16 (mask);
1981 map_clearcell (&lastcell, 0, 0, 0, -1); 1754 map_clearcell (&lastcell, 0, 0, 0, -1);
1982 } 1755 }
1983 } 1756 }
1984 else if (d > 3) 1757 else if (d > 3)
1985 { 1758 {
… …
1987 1760
1988 /* This block deals with spaces that are not visible for whatever 1761 /* This block deals with spaces that are not visible for whatever
1989 * reason. Still may need to send the head for this space. 1762 * reason. Still may need to send the head for this space.
1990 */ 1763 */
1991 1764
1992 oldlen = sl.len; 1765 oldlen = sl.length ();
1993 1766
1994 SockList_AddShort (&sl, mask); 1767 sl << uint16 (mask);
1768
1995 if (lastcell.count != -1) 1769 if (lastcell.count != -1)
1996 need_send = 1; 1770 need_send = 1;
1771
1997 count = -1; 1772 count = -1;
1998 1773
1999 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1774 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2000 { 1775 {
2001 /* Now check to see if any heads need to be sent */ 1776 /* Now check to see if any heads need to be sent */
2002 1777
2003 if (check_head (sl, socket, ax, ay, 2)) 1778 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2004 mask |= 0x4;
2005 if (check_head (sl, socket, ax, ay, 1)) 1779 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2006 mask |= 0x2;
2007 if (check_head (sl, socket, ax, ay, 0)) 1780 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2008 mask |= 0x1;
2009 1781
2010 lastcell.count = count; 1782 lastcell.count = count;
2011
2012 } 1783 }
2013 else 1784 else
2014 { 1785 {
2015 struct MapCell *cell = &lastcell;
2016
2017 /* properly clear a previously sent big face */ 1786 /* properly clear a previously sent big face */
2018 if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) 1787 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1788 || lastcell.stat_hp || lastcell.flags || lastcell.player)
2019 need_send = 1; 1789 need_send = 1;
1790
2020 map_clearcell (&lastcell, 0, 0, 0, count); 1791 map_clearcell (&lastcell, 0, 0, 0, count);
2021 } 1792 }
2022 1793
2023 if ((mask & 0xf) || need_send) 1794 if ((mask & 0xf) || need_send)
2024 {
2025 sl.buf[oldlen + 1] = mask & 0xff; 1795 sl[oldlen + 1] = mask & 0xff;
2026 }
2027 else 1796 else
2028 {
2029 sl.len = oldlen; 1797 sl.reset (oldlen);
2030 }
2031 } 1798 }
2032 else 1799 else
2033 { 1800 {
2034 /* In this block, the space is visible or there are head objects 1801 /* In this block, the space is visible or there are head objects
2035 * we need to send. 1802 * we need to send.
… …
2037 1804
2038 /* Rather than try to figure out what everything that we might 1805 /* Rather than try to figure out what everything that we might
2039 * need to send is, then form the packet after that, 1806 * need to send is, then form the packet after that,
2040 * we presume that we will in fact form a packet, and update 1807 * 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, 1808 * 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 1809 * we just back out sl.length () to the old value, and no harm
2043 * is done. 1810 * is done.
2044 * I think this is simpler than doing a bunch of checks to see 1811 * 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 1812 * what if anything we need to send, setting the bits, then
2046 * doing those checks again to add the real data. 1813 * doing those checks again to add the real data.
2047 */ 1814 */
2048 oldlen = sl.len; 1815 oldlen = sl.length ();
2049 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1816 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2050 eoldlen = esl.len; 1817 eoldlen = esl.length ();
2051 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1818 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2052 SockList_AddShort (&sl, mask); 1819 sl << uint16 (mask);
2053 1820
2054 if (socket.ext_mapinfos) 1821 if (socket.ext_mapinfos)
2055 SockList_AddShort (&esl, emask); 1822 esl << uint16 (emask);
2056 1823
2057 unsigned char dummy; 1824 unsigned char dummy;
2058 unsigned char *last_ext = &dummy; 1825 unsigned char *last_ext = &dummy;
2059 1826
2060 /* Darkness changed */ 1827 /* Darkness changed */
… …
2063 mask |= 0x8; 1830 mask |= 0x8;
2064 1831
2065 if (socket.extmap) 1832 if (socket.extmap)
2066 { 1833 {
2067 *last_ext |= 0x80; 1834 *last_ext |= 0x80;
2068 last_ext = sl.buf + sl.len; 1835 last_ext = &sl[sl.length ()];
2069 SockList_AddChar (&sl, d); 1836 sl << uint8 (d);
2070 } 1837 }
2071 else 1838 else
2072 SockList_AddChar (&sl, 255 - 64 * d); 1839 sl << uint8 (255 - 64 * d);
2073 } 1840 }
2074 1841
2075 lastcell.count = d; 1842 lastcell.count = d;
2076 1843
2077 if (socket.extmap) 1844 if (socket.extmap)
2078 { 1845 {
2079 uint8 stat_hp = 0; 1846 uint8 stat_hp = 0;
2080 uint8 stat_width = 0; 1847 uint8 stat_width = 0;
1848 uint8 flags = 0;
2081 tag_t player = 0; 1849 UUID player = 0;
2082 1850
2083 // send hp information, if applicable 1851 // send hp information, if applicable
2084 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1852 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2085 { 1853 {
2086 if (op->head || op->invisible) 1854 if (op->head || op->invisible)
… …
2093 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1861 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2094 stat_width = op->arch->tail_x; 1862 stat_width = op->arch->tail_x;
2095 } 1863 }
2096 } 1864 }
2097 1865
1866 if (op->msg && op->msg[0] == '@')
1867 flags |= 1;
1868
2098 if (op->type == PLAYER && op != pl) 1869 if (op->type == PLAYER && op != pl)
2099 player = op->count; 1870 player = op->count;
2100 } 1871 }
2101 1872
2102 if (lastcell.stat_hp != stat_hp) 1873 if (lastcell.stat_hp != stat_hp)
2103 { 1874 {
2104 lastcell.stat_hp = stat_hp; 1875 lastcell.stat_hp = stat_hp;
2105 1876
2106 mask |= 0x8; 1877 mask |= 0x8;
2107 *last_ext |= 0x80; 1878 *last_ext |= 0x80;
2108 last_ext = sl.buf + sl.len; 1879 last_ext = &sl[sl.length ()];
2109 SockList_AddChar (&sl, 5); 1880
2110 SockList_AddChar (&sl, stat_hp); 1881 sl << uint8 (5) << uint8 (stat_hp);
2111 1882
2112 if (stat_width > 1) 1883 if (stat_width > 1)
2113 { 1884 {
2114 *last_ext |= 0x80; 1885 *last_ext |= 0x80;
2115 last_ext = sl.buf + sl.len; 1886 last_ext = &sl[sl.length ()];
2116 SockList_AddChar (&sl, 6); 1887
2117 SockList_AddChar (&sl, stat_width); 1888 sl << uint8 (6) << uint8 (stat_width);
2118 } 1889 }
2119 } 1890 }
2120 1891
2121 if (lastcell.player !=player) 1892 if (lastcell.player != player)
2122 { 1893 {
2123 lastcell.player = player; 1894 lastcell.player = player;
2124 1895
2125 mask |= 0x8; 1896 mask |= 0x8;
2126 *last_ext |= 0x80; 1897 *last_ext |= 0x80;
2127 last_ext = sl.buf + sl.len; 1898 last_ext = &sl[sl.length ()];
2128 SockList_AddChar (&sl, 0x47); 1899
2129 SockList_AddChar (&sl, 4); 1900 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2130 SockList_AddInt (&sl, player); 1901 }
1902
1903 if (lastcell.flags != flags)
1904 {
1905 lastcell.flags = flags;
1906
1907 mask |= 0x8;
1908 *last_ext |= 0x80;
1909 last_ext = &sl[sl.length ()];
1910
1911 sl << uint8 (8) << uint8 (flags);
2131 } 1912 }
2132 } 1913 }
2133 1914
2134 /* Floor face */ 1915 /* Floor face */
2135 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 1916 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2136 mask |= 0x4; 1917 mask |= 0x4;
2137 1918
2138 if (socket.EMI_smooth) 1919 if (socket.EMI_smooth)
2139 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 1920 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2140 emask |= 0x4; 1921 emask |= 0x4;
2141 1922
2142 /* Middle face */ 1923 /* Middle face */
2143 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 1924 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2144 mask |= 0x2; 1925 mask |= 0x2;
2145 1926
2146 if (socket.EMI_smooth) 1927 if (socket.EMI_smooth)
2147 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 1928 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2148 emask |= 0x2; 1929 emask |= 0x2;
2149 1930
2150 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1931 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2151 { 1932 {
2152 if (lastcell.faces[0] != pl->face->number) 1933 if (lastcell.faces[0] != pl->face->number)
2153 { 1934 {
2154 lastcell.faces[0] = pl->face->number; 1935 lastcell.faces[0] = pl->face->number;
2155 mask |= 0x1; 1936 mask |= 0x1;
1937
2156 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1938 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2157 esrv_send_face (&socket, pl->face->number, 0); 1939 esrv_send_face (&socket, pl->face->number, 0);
2158 SockList_AddShort (&sl, pl->face->number); 1940
1941 sl << uint16 (pl->face->number);
2159 } 1942 }
2160 } 1943 }
2161 /* Top face */
2162 else 1944 else
2163 { 1945 {
1946 /* Top face */
2164 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 1947 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2165 mask |= 0x1; 1948 mask |= 0x1;
1949
2166 if (socket.EMI_smooth) 1950 if (socket.EMI_smooth)
2167 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 1951 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2168 {
2169 emask |= 0x1; 1952 emask |= 0x1;
2170 }
2171 } 1953 }
1954
2172 /* Check to see if we are in fact sending anything for this 1955 /* Check to see if we are in fact sending anything for this
2173 * space by checking the mask. If so, update the mask. 1956 * space by checking the mask. If so, update the mask.
2174 * if not, reset the len to that from before adding the mask 1957 * if not, reset the len to that from before adding the mask
2175 * value, so we don't send those bits. 1958 * value, so we don't send those bits.
2176 */ 1959 */
2177 if (mask & 0xf) 1960 if (mask & 0xf)
2178 {
2179 sl.buf[oldlen + 1] = mask & 0xff; 1961 sl[oldlen + 1] = mask & 0xff;
2180 }
2181 else 1962 else
2182 {
2183 sl.len = oldlen; 1963 sl.reset (oldlen);
2184 } 1964
2185 if (emask & 0xf) 1965 if (emask & 0xf)
2186 {
2187 esl.buf[eoldlen + 1] = emask & 0xff; 1966 esl[eoldlen + 1] = emask & 0xff;
2188 }
2189 else 1967 else
2190 {
2191 esl.len = eoldlen; 1968 esl.reset (eoldlen);
2192 }
2193 } /* else this is a viewable space */ 1969 } /* else this is a viewable space */
2194 } /* for x loop */ 1970 } /* for x loop */
2195 } /* for y loop */ 1971 } /* for y loop */
2196 1972
2197 /* Verify that we in fact do need to send this */ 1973 /* Verify that we in fact do need to send this */
2198 if (socket.ext_mapinfos) 1974 if (socket.ext_mapinfos)
2199 { 1975 {
2200 if (!(sl.len > startlen || socket.sent_scroll)) 1976 if (!(sl.length () > startlen || socket.sent_scroll))
2201 { 1977 {
2202 /* No map data will follow, so don't say the client 1978 /* No map data will follow, so don't say the client
2203 * it doesn't need draw! 1979 * it doesn't need draw!
2204 */ 1980 */
2205 ewhatflag &= (~EMI_NOREDRAW); 1981 ewhatflag &= (~EMI_NOREDRAW);
2206 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1982 esl[ewhatstart + 1] = ewhatflag & 0xff;
2207 } 1983 }
1984
2208 if (esl.len > estartlen) 1985 if (esl.length () > estartlen)
2209 { 1986 socket.send_packet (esl);
2210 Send_With_Handling (&socket, &esl);
2211 }
2212 free (esl.buf);
2213 } 1987 }
1988
2214 if (sl.len > startlen || socket.sent_scroll) 1989 if (sl.length () > startlen || socket.sent_scroll)
2215 { 1990 {
2216 Send_With_Handling (&socket, &sl); 1991 socket.send_packet (sl);
2217 socket.sent_scroll = 0; 1992 socket.sent_scroll = 0;
2218 } 1993 }
2219 free (sl.buf);
2220} 1994}
2221 1995
2222/** 1996/**
2223 * Draws client map. 1997 * Draws client map.
2224 */ 1998 */
… …
2229 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2003 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2230 New_Face *face, *floor; 2004 New_Face *face, *floor;
2231 New_Face *floor2; 2005 New_Face *floor2;
2232 int d, mflags; 2006 int d, mflags;
2233 struct Map newmap; 2007 struct Map newmap;
2234 mapstruct *m, *pm; 2008 maptile *m, *pm;
2235 2009
2236 if (pl->type != PLAYER) 2010 if (pl->type != PLAYER)
2237 { 2011 {
2238 LOG (llevError, "draw_client_map called with non player/non eric-server\n"); 2012 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2239 return; 2013 return;
… …
2248 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2022 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2249 return; 2023 return;
2250 2024
2251 memset (&newmap, 0, sizeof (struct Map)); 2025 memset (&newmap, 0, sizeof (struct Map));
2252 2026
2253 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2027 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2254 {
2255 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2028 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2256 { 2029 {
2257 ax = i; 2030 ax = i;
2258 ay = j; 2031 ay = j;
2259 m = pm; 2032 m = pm;
2260 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2033 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2034
2261 if (mflags & P_OUT_OF_MAP) 2035 if (mflags & P_OUT_OF_MAP)
2262 continue; 2036 continue;
2263 if (mflags & P_NEED_UPDATE) 2037
2264 update_position (m, ax, ay);
2265 /* If a map is visible to the player, we don't want to swap it out 2038 /* If a map is visible to the player, we don't want to swap it out
2266 * just to reload it. This should really call something like 2039 * just to reload it. This should really call something like
2267 * swap_map, but this is much more efficient and 'good enough' 2040 * swap_map, but this is much more efficient and 'good enough'
2268 */ 2041 */
2269 if (mflags & P_NEW_MAP) 2042 if (mflags & P_NEW_MAP)
2270 m->timeout = 50; 2043 m->timeout = 50;
2271 } 2044 }
2272 } 2045
2273 /* do LOS after calls to update_position */ 2046 /* do LOS after calls to update_position */
2274 if (pl->contr->do_los) 2047 if (pl->contr->do_los)
2275 { 2048 {
2276 update_los (pl); 2049 update_los (pl);
2277 pl->contr->do_los = 0; 2050 pl->contr->do_los = 0;
2278 } 2051 }
2279 2052
2280 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2281 {
2282 /* Big maps need a different drawing mechanism to work */ 2053 /* Big maps need a different drawing mechanism to work */
2283 draw_client_map1 (pl); 2054 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} 2055}
2347 2056
2348 2057
2349/*****************************************************************************/ 2058/*****************************************************************************/
2350 2059
… …
2356 2065
2357/*****************************************************************************/ 2066/*****************************************************************************/
2358void 2067void
2359send_plugin_custom_message (object *pl, char *buf) 2068send_plugin_custom_message (object *pl, char *buf)
2360{ 2069{
2361 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2070 pl->contr->ns->send_packet (buf);
2362} 2071}
2363 2072
2364/** 2073/**
2365 * This sends the skill number to name mapping. We ignore 2074 * This sends the skill number to name mapping. We ignore
2366 * the params - we always send the same info no matter what. 2075 * the params - we always send the same info no matter what.
2367 */ 2076 */
2368void 2077void
2369send_skill_info (NewSocket * ns, char *params) 2078send_skill_info (client *ns, char *params)
2370{ 2079{
2371 SockList sl; 2080 packet sl;
2372 int i; 2081 sl << "replyinfo skill_info\n";
2373 2082
2374 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2375 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2376 for (i = 1; i < NUM_SKILLS; i++) 2083 for (int i = 1; i < NUM_SKILLS; i++)
2377 { 2084 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]); 2085
2379 }
2380 sl.len = strlen ((char *) sl.buf);
2381 if (sl.len >= MAXSOCKBUF) 2086 if (sl.length () >= MAXSOCKBUF)
2382 { 2087 {
2383 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2088 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2384 fatal (0); 2089 fatal (0);
2385 } 2090 }
2386 Send_With_Handling (ns, &sl); 2091
2387 free (sl.buf); 2092 ns->send_packet (sl);
2388} 2093}
2389 2094
2390/** 2095/**
2391 * This sends the spell path to name mapping. We ignore 2096 * This sends the spell path to name mapping. We ignore
2392 * the params - we always send the same info no matter what. 2097 * the params - we always send the same info no matter what.
2393 */ 2098 */
2394void 2099void
2395send_spell_paths (NewSocket * ns, char *params) 2100send_spell_paths (client * ns, char *params)
2396{ 2101{
2397 SockList sl; 2102 packet sl;
2398 int i;
2399 2103
2400 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2104 sl << "replyinfo spell_paths\n";
2401 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2105
2402 for (i = 0; i < NRSPELLPATHS; i++) 2106 for (int i = 0; i < NRSPELLPATHS; i++)
2403 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2107 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2404 sl.len = strlen ((char *) sl.buf); 2108
2405 if (sl.len >= MAXSOCKBUF) 2109 if (sl.length () >= MAXSOCKBUF)
2406 { 2110 {
2407 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2111 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2408 fatal (0); 2112 fatal (0);
2409 } 2113 }
2410 Send_With_Handling (ns, &sl); 2114
2411 free (sl.buf); 2115 ns->send_packet (sl);
2412} 2116}
2413 2117
2414/** 2118/**
2415 * This looks for any spells the player may have that have changed their stats. 2119 * 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 2120 * it then sends an updspell packet for each spell that has changed in this way
2417 */ 2121 */
2418void 2122void
2419esrv_update_spells (player *pl) 2123esrv_update_spells (player *pl)
2420{ 2124{
2421 SockList sl;
2422 int flags = 0;
2423 object *spell;
2424
2425 if (!pl->socket.monitor_spells) 2125 if (!pl->ns->monitor_spells)
2426 return; 2126 return;
2127
2427 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2128 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2428 { 2129 {
2429 if (spell->type == SPELL) 2130 if (spell->type == SPELL)
2430 { 2131 {
2132 int flags = 0;
2133
2431 /* check if we need to update it */ 2134 /* check if we need to update it */
2432 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2135 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2433 { 2136 {
2434 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2137 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2435 flags |= UPD_SP_MANA; 2138 flags |= UPD_SP_MANA;
2436 } 2139 }
2140
2437 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2141 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2438 { 2142 {
2439 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2143 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2440 flags |= UPD_SP_GRACE; 2144 flags |= UPD_SP_GRACE;
2441 } 2145 }
2146
2442 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2147 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2443 { 2148 {
2444 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2149 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2445 flags |= UPD_SP_DAMAGE; 2150 flags |= UPD_SP_DAMAGE;
2446 } 2151 }
2152
2447 if (flags != 0) 2153 if (flags)
2448 { 2154 {
2449 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2155 packet sl;
2450 strcpy ((char *) sl.buf, "updspell "); 2156
2451 sl.len = strlen ((char *) sl.buf); 2157 sl << "updspell "
2452 SockList_AddChar (&sl, flags); 2158 << uint8 (flags)
2453 SockList_AddInt (&sl, spell->count); 2159 << uint32 (spell->count);
2454 if (flags & UPD_SP_MANA) 2160
2455 SockList_AddShort (&sl, spell->last_sp); 2161 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2456 if (flags & UPD_SP_GRACE) 2162 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2457 SockList_AddShort (&sl, spell->last_grace); 2163 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2458 if (flags & UPD_SP_DAMAGE) 2164
2459 SockList_AddShort (&sl, spell->last_eat); 2165 pl->ns->send_packet (sl);
2460 flags = 0;
2461 Send_With_Handling (&pl->socket, &sl);
2462 free (sl.buf);
2463 } 2166 }
2464 } 2167 }
2465 } 2168 }
2466} 2169}
2467 2170
2468void 2171void
2469esrv_remove_spell (player *pl, object *spell) 2172esrv_remove_spell (player *pl, object *spell)
2470{ 2173{
2471 SockList sl;
2472
2473 if (!pl->socket.monitor_spells) 2174 if (!pl->ns->monitor_spells)
2474 return; 2175 return;
2176
2475 if (!pl || !spell || spell->env != pl->ob) 2177 if (!pl || !spell || spell->env != pl->ob)
2476 { 2178 {
2477 LOG (llevError, "Invalid call to esrv_remove_spell"); 2179 LOG (llevError, "Invalid call to esrv_remove_spell");
2478 return; 2180 return;
2479 } 2181 }
2480 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2182
2481 strcpy ((char *) sl.buf, "delspell "); 2183 packet sl ("delspell");
2482 sl.len = strlen ((char *) sl.buf); 2184
2483 SockList_AddInt (&sl, spell->count); 2185 sl << uint32 (spell->count);
2484 Send_With_Handling (&pl->socket, &sl); 2186
2485 free (sl.buf); 2187 pl->ns->send_packet (sl);
2486} 2188}
2487 2189
2488/* appends the spell *spell to the Socklist we will send the data to. */ 2190/* appends the spell *spell to the Socklist we will send the data to. */
2489static void 2191static void
2490append_spell (player *pl, SockList * sl, object *spell) 2192append_spell (player *pl, packet &sl, object *spell)
2491{ 2193{
2492 int len, i, skill = 0; 2194 int len, i, skill = 0;
2493 2195
2494 if (!(spell->name)) 2196 if (!(spell->name))
2495 { 2197 {
2496 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2198 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2497 return; 2199 return;
2498 } 2200 }
2499 SockList_AddInt (sl, spell->count); 2201
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 */ 2202 /* 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); 2203 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); 2204 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); 2205 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 2206
2511 /* figure out which skill it uses, if it uses one */ 2207 /* figure out which skill it uses, if it uses one */
2512 if (spell->skill) 2208 if (spell->skill)
2513 { 2209 {
2514 for (i = 1; i < NUM_SKILLS; i++) 2210 for (i = 1; i < NUM_SKILLS; i++)
… …
2516 { 2212 {
2517 skill = i + CS_STAT_SKILLINFO; 2213 skill = i + CS_STAT_SKILLINFO;
2518 break; 2214 break;
2519 } 2215 }
2520 } 2216 }
2521 SockList_AddChar (sl, skill);
2522 2217
2523 SockList_AddInt (sl, spell->path_attuned); 2218 /* send the current values */
2219 sl << uint32 (spell->count)
2220 << uint16 (spell->level)
2221 << uint16 (spell->casting_time)
2222 << uint16 (spell->last_sp)
2223 << uint16 (spell->last_grace)
2224 << uint16 (spell->last_eat)
2225 << uint8 (skill)
2226 << uint32 (spell->path_attuned)
2524 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2227 << uint32 (spell->face ? spell->face->number : 0)
2525 2228 << data8 (spell->name)
2526 len = strlen (spell->name); 2229 << 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} 2230}
2543 2231
2544/** 2232/**
2545 * This tells the client to add the spell *ob, if *ob is NULL, then add 2233 * This tells the client to add the spell *ob, if *ob is NULL, then add
2546 * all spells in the player's inventory. 2234 * all spells in the player's inventory.
2547 */ 2235 */
2548void 2236void
2549esrv_add_spells (player *pl, object *spell) 2237esrv_add_spells (player *pl, object *spell)
2550{ 2238{
2551 SockList sl;
2552
2553 if (!pl) 2239 if (!pl)
2554 { 2240 {
2555 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2241 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2556 return; 2242 return;
2557 } 2243 }
2244
2558 if (!pl->socket.monitor_spells) 2245 if (!pl->ns->monitor_spells)
2559 return; 2246 return;
2560 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2247
2561 strcpy ((char *) sl.buf, "addspell "); 2248 packet sl ("addspell");
2562 sl.len = strlen ((char *) sl.buf); 2249
2563 if (!spell) 2250 if (!spell)
2564 { 2251 {
2565 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2252 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2566 { 2253 {
2567 /* were we to simply keep appending data here, we could exceed 2254 /* 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 2264 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2578 * like it will fix this 2265 * like it will fix this
2579 */ 2266 */
2580 if (spell->type != SPELL) 2267 if (spell->type != SPELL)
2581 continue; 2268 continue;
2269
2582 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2270 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2583 { 2271 {
2584 Send_With_Handling (&pl->socket, &sl); 2272 pl->ns->send_packet (sl);
2585 strcpy ((char *) sl.buf, "addspell "); 2273
2586 sl.len = strlen ((char *) sl.buf); 2274 sl.reset ();
2275 sl << "addspell ";
2587 } 2276 }
2277
2588 append_spell (pl, &sl, spell); 2278 append_spell (pl, sl, spell);
2589 } 2279 }
2590 } 2280 }
2591 else if (spell->type != SPELL) 2281 else if (spell->type != SPELL)
2592 { 2282 {
2593 LOG (llevError, "Asked to send a non-spell object as a spell"); 2283 LOG (llevError, "Asked to send a non-spell object as a spell");
2594 return; 2284 return;
2595 } 2285 }
2596 else 2286 else
2597 append_spell (pl, &sl, spell); 2287 append_spell (pl, sl, spell);
2288
2598 if (sl.len >= MAXSOCKBUF) 2289 if (sl.length () >= MAXSOCKBUF)
2599 { 2290 {
2600 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2291 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2601 fatal (0); 2292 fatal (0);
2602 } 2293 }
2294
2603 /* finally, we can send the packet */ 2295 /* finally, we can send the packet */
2604 Send_With_Handling (&pl->socket, &sl); 2296 pl->ns->send_packet (sl);
2605 free (sl.buf);
2606} 2297}
2298

Diff Legend

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