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

Diff Legend

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