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

Diff Legend

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