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.23 by root, Tue Sep 19 10:35:22 2006 UTC vs.
Revision 1.43 by root, Sat Dec 16 20:16:37 2006 UTC

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

Diff Legend

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