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.27 by root, Wed Dec 13 18:08:02 2006 UTC vs.
Revision 1.41 by root, Fri Dec 15 19:59:20 2006 UTC

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

Diff Legend

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