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

Diff Legend

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