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.43 by root, Sat Dec 16 20:16:37 2006 UTC

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

Diff Legend

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