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.26 by pippijn, Mon Dec 11 19:46:47 2006 UTC vs.
Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC

… …
38 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
39 * 39 *
40 * esrv_map_setbelow allows filling in all of the faces for the map. 40 * esrv_map_setbelow allows filling in all of the faces for the map.
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
44 * operations
45 *
46 * esrv_map_doneredraw finishes the map update, and ships across the
47 * map updates.
48 *
49 */ 43 */
50 44
51#include <global.h> 45#include <global.h>
52#include <sproto.h> 46#include <sproto.h>
53 47
54#include <newclient.h>
55#include <newserver.h>
56#include <living.h> 48#include <living.h>
57#include <commands.h> 49#include <commands.h>
58 50
59/* This block is basically taken from socket.c - I assume if it works there, 51/* This block is basically taken from socket.c - I assume if it works there,
60 * it should work here. 52 * it should work here.
… …
63#include <sys/time.h> 55#include <sys/time.h>
64#include <sys/socket.h> 56#include <sys/socket.h>
65#include <netinet/in.h> 57#include <netinet/in.h>
66#include <netdb.h> 58#include <netdb.h>
67 59
68#ifdef HAVE_UNISTD_H
69# include <unistd.h> 60#include <unistd.h>
70#endif
71
72#ifdef HAVE_SYS_TIME_H
73# include <sys/time.h> 61#include <sys/time.h>
74#endif
75 62
76#include "sounds.h" 63#include "sounds.h"
77 64
78/** 65/**
79 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
… …
96 -1, /* life stealing */ 83 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
98}; 85};
99 86
100static void 87static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
102{ 89{
103 struct Map newmap; 90 struct Map newmap;
104 int x, y, mx, my; 91 int x, y, mx, my;
105 92
106 {
107 char buf[MAXSOCKBUF];
108
109 sprintf (buf, "map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
110 Write_String_To_Socket (ns, buf, strlen (buf));
111 }
112 94
113 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
114 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
115 * So set the mx,my to the max value we want to 97 * So set the mx,my to the max value we want to
116 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
156} 138}
157 139
158static void 140static void
159clear_map (player *pl) 141clear_map (player *pl)
160{ 142{
161 NewSocket & socket = pl->socket;
162
163 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
164 144
165 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
166 Write_String_To_Socket (&socket, "newmap", 6); 146 pl->ns->send_packet ("newmap");
167 147
168 socket.update_look = 1; 148 pl->ns->floorbox_reset ();
169 socket.look_position = 0;
170} 149}
171 150
172/** check for map change and send new map data */ 151/** check for map change and send new map data */
173static void 152static void
174check_map_change (player *pl) 153check_map_change (player *pl)
175{ 154{
176 NewSocket & socket = pl->socket; 155 client &socket = *pl->ns;
177 object *ob = pl->ob; 156 object *ob = pl->ob;
178 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
179 158
180 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
181 { 160 {
… …
202 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
203 } 182 }
204 else 183 else
205 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
206 185
207 Write_String_To_Socket (&socket, buf, strlen (buf)); 186 socket.send_packet (buf);
208 } 187 }
209 } 188 }
210 else if (socket.current_x != ob->x || socket.current_y != ob->y) 189 else if (socket.current_x != ob->x || socket.current_y != ob->y)
211 { 190 {
212 int dx = ob->x - socket.current_x; 191 int dx = ob->x - socket.current_x;
… …
215 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
216 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
217 else 196 else
218 { 197 {
219 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
220 socket.update_look = 1; 199 socket.floorbox_reset ();
221 socket.look_position = 0;
222 } 200 }
223 } 201 }
224 202
225 socket.current_x = ob->x; 203 socket.current_x = ob->x;
226 socket.current_y = ob->y; 204 socket.current_y = ob->y;
227} 205}
228 206
207/**
208 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide
210 * that information.
211 */
212void
213RequestInfo (char *buf, int len, client * ns)
214{
215 char *params = NULL, *cp;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227
228 /* find the first space, make it null, and update the
229 * params pointer.
230 */
231 for (cp = buf; *cp != '\0'; cp++)
232 if (*cp == ' ')
233 {
234 *cp = '\0';
235 params = cp + 1;
236 break;
237 }
238
239 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params);
241 else if (!strcmp (buf, "image_sums"))
242 send_image_sums (ns, params);
243 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params);
247 else
248 ns->send_packet (bigbuf, len);
249}
250
229void 251void
230ExtCmd (char *buf, int len, player *pl) 252ExtCmd (char *buf, int len, player *pl)
231{ 253{
232 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
255}
256
257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
233} 261}
234 262
235void 263void
236MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
237{ 265{
… …
252 buf += 8; 280 buf += 8;
253 281
254 // initial map and its origin 282 // initial map and its origin
255 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
256 sint16 dx, dy; 284 sint16 dx, dy;
257 int mapx = pl->socket.mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
258 int mapy = pl->socket.mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
259 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
260 288
261 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
262 { 290 {
263 int dir = *buf++; 291 int dir = *buf++;
… …
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
315 } 343 }
316 else 344 else
317 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
318 346
319 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 347 pl->ns->send_packet (bigbuf);
320} 348}
321 349
322/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
323void 351void
324SetUp (char *buf, int len, NewSocket * ns) 352SetUp (char *buf, int len, client * ns)
325{ 353{
326 int s, slen; 354 int s, slen;
327 char *cmd, *param, cmdback[HUGE_BUF]; 355 char *cmd, *param, cmdback[HUGE_BUF];
328 356
329 /* run through the cmds of setup 357 /* run through the cmds of setup
… …
331 * 359 *
332 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 360 * 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 361 * The client then must sort this out
334 */ 362 */
335 363
336 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 364 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
365
337 strcpy (cmdback, "setup"); 366 strcpy (cmdback, "setup");
338 for (s = 0; s < len;) 367 for (s = 0; s < len; )
339 { 368 {
340
341 cmd = &buf[s]; 369 cmd = &buf[s];
342 370
343 /* find the next space, and put a null there */ 371 /* find the next space, and put a null there */
344 for (; buf[s] && buf[s] != ' '; s++); 372 for (; buf[s] && buf[s] != ' '; s++)
373 ;
374
345 buf[s++] = 0; 375 buf[s++] = 0;
376
346 while (buf[s] == ' ') 377 while (buf[s] == ' ')
347 s++; 378 s++;
348 379
349 if (s >= len) 380 if (s >= len)
350 break; 381 break;
351 382
352 param = &buf[s]; 383 param = &buf[s];
353 384
354 for (; buf[s] && buf[s] != ' '; s++); 385 for (; buf[s] && buf[s] != ' '; s++)
386 ;
387
355 buf[s++] = 0; 388 buf[s++] = 0;
389
356 while (buf[s] == ' ') 390 while (buf[s] == ' ')
357 s++; 391 s++;
358 392
359 slen = strlen (cmdback); 393 slen = strlen (cmdback);
360 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 394 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
521 * report a failure to the client. 555 * report a failure to the client.
522 */ 556 */
523 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 557 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
524 } 558 }
525 } /* for processing all the setup commands */ 559 } /* for processing all the setup commands */
560
526 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 561 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
527 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 562 ns->send_packet (cmdback);
528} 563}
529 564
530/** 565/**
531 * The client has requested to be added to the game. 566 * 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. 567 * 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, 568 * 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. 569 * it either has to be here or init_sockets needs to be exported.
535 */ 570 */
536void 571void
537AddMeCmd (char *buf, int len, NewSocket * ns) 572AddMeCmd (char *buf, int len, client * ns)
538{ 573{
539 Settings oldsettings; 574 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
540
541 oldsettings = settings;
542 if (ns->status != Ns_Add || add_player (ns))
543 {
544 Write_String_To_Socket (ns, "addme_failed", 12);
545 }
546 else
547 {
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} 575}
559 576
560/** Reply to ExtendedInfos command */ 577/** Reply to ExtendedInfos command */
561void 578void
562ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 579ToggleExtendedInfos (char *buf, int len, client * ns)
563{ 580{
564 char cmdback[MAX_BUF]; 581 char cmdback[MAX_BUF];
565 char command[50]; 582 char command[50];
566 int info, nextinfo; 583 int info, nextinfo;
567 584
… …
605 { 622 {
606 strcat (cmdback, " "); 623 strcat (cmdback, " ");
607 strcat (cmdback, "smoothing"); 624 strcat (cmdback, "smoothing");
608 } 625 }
609 626
610 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 627 ns->send_packet (cmdback);
611} 628}
612 629
613/* 630/*
614#define MSG_TYPE_BOOK 1 631#define MSG_TYPE_BOOK 1
615#define MSG_TYPE_CARD 2 632#define MSG_TYPE_CARD 2
… …
618#define MSG_TYPE_MONUMENT 5 635#define MSG_TYPE_MONUMENT 5
619#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 636#define MSG_TYPE_SCRIPTED_DIALOG 6*/
620 637
621/** Reply to ExtendedInfos command */ 638/** Reply to ExtendedInfos command */
622void 639void
623ToggleExtendedText (char *buf, int len, NewSocket * ns) 640ToggleExtendedText (char *buf, int len, client * ns)
624{ 641{
625 char cmdback[MAX_BUF]; 642 char cmdback[MAX_BUF];
626 char temp[10]; 643 char temp[10];
627 char command[50]; 644 char command[50];
628 int info, nextinfo, i, flag; 645 int info, nextinfo, i, flag;
… …
668 strcat (cmdback, " "); 685 strcat (cmdback, " ");
669 snprintf (temp, sizeof (temp), "%d", i); 686 snprintf (temp, sizeof (temp), "%d", i);
670 strcat (cmdback, temp); 687 strcat (cmdback, temp);
671 } 688 }
672 689
673 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 690 ns->send_packet (cmdback);
674} 691}
675 692
676/** 693/**
677 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 694 * 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 695 * 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 696 * 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 697 * if we know the client wants it, might as well push it to the
681 * client. 698 * client.
682 */ 699 */
683static void 700static void
684SendSmooth (NewSocket * ns, uint16 face) 701SendSmooth (client *ns, uint16 face)
685{ 702{
686 uint16 smoothface; 703 uint16 smoothface;
687 unsigned char reply[MAX_BUF];
688 SockList sl;
689 704
690 /* If we can't find a face, return and set it so we won't try to send this 705 /* If we can't find a face, return and set it so we won't try to send this
691 * again. 706 * again.
692 */ 707 */
693 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 708 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
701 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 716 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
702 esrv_send_face (ns, smoothface, 0); 717 esrv_send_face (ns, smoothface, 0);
703 718
704 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 719 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
705 720
706 sl.buf = reply; 721 packet sl ("smooth");
707 strcpy ((char *) sl.buf, "smooth "); 722
708 sl.len = strlen ((char *) sl.buf); 723 sl << uint16 (face)
709 SockList_AddShort (&sl, face); 724 << uint16 (smoothface);
710 SockList_AddShort (&sl, smoothface); 725
711 Send_With_Handling (ns, &sl); 726 ns->send_packet (sl);
712} 727}
713 728
714 /** 729 /**
715 * Tells client the picture it has to use 730 * Tells client the picture it has to use
716 * to smooth a picture number given as argument. 731 * to smooth a picture number given as argument.
717 */ 732 */
718void 733void
719AskSmooth (char *buf, int len, NewSocket * ns) 734AskSmooth (char *buf, int len, client *ns)
720{ 735{
721 uint16 facenbr; 736 SendSmooth (ns, atoi (buf));
722
723 facenbr = atoi (buf);
724 SendSmooth (ns, facenbr);
725} 737}
726
727
728
729
730 738
731/** 739/**
732 * This handles the general commands from the client (ie, north, fire, cast, 740 * This handles the general commands from the client (ie, north, fire, cast,
733 * etc.) 741 * etc.)
734 */ 742 */
735void 743void
736PlayerCmd (char *buf, int len, player *pl) 744PlayerCmd (char *buf, int len, player *pl)
737{ 745{
738
739 /* The following should never happen with a proper or honest client.
740 * Therefore, the error message doesn't have to be too clear - if
741 * someone is playing with a hacked/non working client, this gives them
742 * an idea of the problem, but they deserve what they get
743 */
744 if (pl->state != ST_PLAYING)
745 {
746 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
747 return;
748 }
749 /* Check if there is a count. In theory, a zero count could also be 746 /* Check if there is a count. In theory, a zero count could also be
750 * sent, so check for that also. 747 * sent, so check for that also.
751 */ 748 */
752 if (atoi (buf) || buf[0] == '0') 749 if (atoi (buf) || buf[0] == '0')
753 { 750 {
754 pl->count = atoi ((char *) buf); 751 pl->count = atoi ((char *) buf);
752
755 buf = strchr (buf, ' '); /* advance beyond the numbers */ 753 buf = strchr (buf, ' '); /* advance beyond the numbers */
756 if (!buf) 754 if (!buf)
757 {
758#ifdef ESRV_DEBUG
759 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
760#endif
761 return; 755 return;
762 } 756
763 buf++; 757 buf++;
764 } 758 }
765 /* This should not happen anymore. */ 759
766 if (pl->ob->speed_left < -1.0)
767 {
768 LOG (llevError, "Player has negative time - shouldn't do command.\n");
769 }
770 /* In c_new.c */
771 execute_newserver_command (pl->ob, (char *) buf); 760 execute_newserver_command (pl->ob, (char *) buf);
761
772 /* Perhaps something better should be done with a left over count. 762 /* Perhaps something better should be done with a left over count.
773 * Cleaning up the input should probably be done first - all actions 763 * Cleaning up the input should probably be done first - all actions
774 * for the command that issued the count should be done before any other 764 * for the command that issued the count should be done before any other
775 * commands. 765 * commands.
776 */ 766 */
777
778 pl->count = 0; 767 pl->count = 0;
779
780} 768}
781 769
782 770
783/** 771/**
784 * This handles the general commands from the client (ie, north, fire, cast, 772 * This handles the general commands from the client (ie, north, fire, cast,
785 * etc.). It is a lot like PlayerCmd above, but is called with the 773 * etc.). It is a lot like PlayerCmd above, but is called with the
786 * 'ncom' method which gives more information back to the client so it 774 * 'ncom' method which gives more information back to the client so it
787 * can throttle. 775 * can throttle.
788 */ 776 */
789void 777void
790NewPlayerCmd (uint8 * buf, int len, player *pl) 778NewPlayerCmd (char *buf, int len, player *pl)
791{ 779{
792 int time, repeat;
793 short packet;
794 unsigned char command[MAX_BUF];
795 SockList sl;
796
797 if (len < 7) 780 if (len <= 6)
798 { 781 {
799 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 782 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
800 return; 783 return;
801 } 784 }
802 785
803 packet = GetShort_String (buf); 786 uint16 cmdid = net_uint16 ((uint8 *)buf);
804 repeat = GetInt_String (buf + 2); 787 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
788
805 /* -1 is special - no repeat, but don't update */ 789 /* -1 is special - no repeat, but don't update */
806 if (repeat != -1) 790 if (repeat != -1)
807 {
808 pl->count = repeat; 791 pl->count = repeat;
809 }
810 if ((len - 4) >= MAX_BUF)
811 len = MAX_BUF - 5;
812 792
813 strncpy ((char *) command, (char *) buf + 6, len - 4); 793 buf += 6; //len -= 6;
814 command[len - 4] = '\0';
815 794
816 /* The following should never happen with a proper or honest client.
817 * Therefore, the error message doesn't have to be too clear - if
818 * someone is playing with a hacked/non working client, this gives them
819 * an idea of the problem, but they deserve what they get
820 */
821 if (pl->state != ST_PLAYING)
822 {
823 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
824 return;
825 }
826
827 /* This should not happen anymore. */
828 if (pl->ob->speed_left < -1.0)
829 {
830 LOG (llevError, "Player has negative time - shouldn't do command.\n");
831 }
832 /* In c_new.c */
833 execute_newserver_command (pl->ob, (char *) command); 795 execute_newserver_command (pl->ob, buf);
796
834 /* Perhaps something better should be done with a left over count. 797 /* Perhaps something better should be done with a left over count.
835 * Cleaning up the input should probably be done first - all actions 798 * Cleaning up the input should probably be done first - all actions
836 * for the command that issued the count should be done before any other 799 * for the command that issued the count should be done before any other
837 * commands. 800 * commands.
838 */ 801 */
839 pl->count = 0; 802 pl->count = 0;
840 803
804 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
805 int time = FABS (pl->ob->speed) < 0.001
806 ? time = MAX_TIME * 100
807 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
808
841 /* Send confirmation of command execution now */ 809 /* Send confirmation of command execution now */
842 sl.buf = command; 810 packet sl ("comc");
843 strcpy ((char *) sl.buf, "comc "); 811 sl << uint16 (cmdid) << uint32 (time);
844 sl.len = 5; 812 pl->ns->send_packet (sl);
845 SockList_AddShort (&sl, packet);
846 if (FABS (pl->ob->speed) < 0.001)
847 time = MAX_TIME * 100;
848 else
849 time = (int) (MAX_TIME / FABS (pl->ob->speed));
850 SockList_AddInt (&sl, time);
851 Send_With_Handling (&pl->socket, &sl);
852} 813}
853
854 814
855/** This is a reply to a previous query. */ 815/** This is a reply to a previous query. */
856void 816void
857ReplyCmd (char *buf, int len, player *pl) 817ReplyCmd (char *buf, int len, client *ns)
858{ 818{
819 if (ns->state == ST_CUSTOM)
820 {
821 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
822 return;
823 }
824
825 if (!ns->pl)
826 return; //TODO: depends on the exact reply we are after
827 //TODO: but right now, we always have a ns->pl
828
829 player *pl = ns->pl;
830
859 /* This is to synthesize how the data would be stored if it 831 /* This is to synthesize how the data would be stored if it
860 * was normally entered. A bit of a hack, and should be cleaned up 832 * was normally entered. A bit of a hack, and should be cleaned up
861 * once all the X11 code is removed from the server. 833 * once all the X11 code is removed from the server.
862 * 834 *
863 * We pass 13 to many of the functions because this way they 835 * We pass 13 to many of the functions because this way they
864 * think it was the carriage return that was entered, and the 836 * think it was the carriage return that was entered, and the
865 * function then does not try to do additional input. 837 * function then does not try to do additional input.
866 */ 838 */
867 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 839 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
868 840
869 /* this avoids any hacking here */ 841 /* this avoids any hacking here */
870 842
871 switch (pl->state) 843 switch (ns->state)
872 { 844 {
873 case ST_PLAYING: 845 case ST_PLAYING:
874 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 846 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
875 break; 847 break;
876 848
877 case ST_PLAY_AGAIN:
878 /* We can check this for return value (2==quit). Maybe we
879 * should, and do something appropriate?
880 */
881 receive_play_again (pl->ob, buf[0]);
882 break;
883
884 case ST_ROLL_STAT:
885 key_roll_stat (pl->ob, buf[0]);
886 break;
887
888 case ST_CHANGE_CLASS: 849 case ST_CHANGE_CLASS:
889
890 key_change_class (pl->ob, buf[0]); 850 key_change_class (pl->ob, buf[0]);
891 break; 851 break;
892 852
893 case ST_CONFIRM_QUIT: 853 case ST_CONFIRM_QUIT:
894 key_confirm_quit (pl->ob, buf[0]); 854 key_confirm_quit (pl->ob, buf[0]);
895 break; 855 break;
896 856
897 case ST_CONFIGURE:
898 LOG (llevError, "In client input handling, but into configure state\n");
899 pl->state = ST_PLAYING;
900 break;
901
902 case ST_GET_NAME:
903 receive_player_name (pl->ob, 13);
904 break;
905
906 case ST_GET_PASSWORD:
907 case ST_CONFIRM_PASSWORD:
908 receive_player_password (pl->ob, 13);
909 break;
910
911 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 857 case ST_GET_PARTY_PASSWORD: /* Get password for party */
912 receive_party_password (pl->ob, 13); 858 receive_party_password (pl->ob, 13);
913 break; 859 break;
914 860
915 default: 861 default:
916 LOG (llevError, "Unknown input state: %d\n", pl->state); 862 LOG (llevError, "Unknown input state: %d\n", ns->state);
917 } 863 }
918} 864}
919 865
920/** 866/**
921 * Client tells its version. If there is a mismatch, we close the 867 * Client tells its version. If there is a mismatch, we close the
… …
923 * something older than the server. If we assume the client will be 869 * something older than the server. If we assume the client will be
924 * backwards compatible, having it be a later version should not be a 870 * backwards compatible, having it be a later version should not be a
925 * problem. 871 * problem.
926 */ 872 */
927void 873void
928VersionCmd (char *buf, int len, NewSocket * ns) 874VersionCmd (char *buf, int len, client * ns)
929{ 875{
930 char *cp;
931 char version_warning[256];
932
933 if (!buf) 876 if (!buf)
934 { 877 {
935 LOG (llevError, "CS: received corrupted version command\n"); 878 LOG (llevError, "CS: received corrupted version command\n");
936 return; 879 return;
937 } 880 }
938 881
939 ns->cs_version = atoi (buf); 882 ns->cs_version = atoi (buf);
940 ns->sc_version = ns->cs_version; 883 ns->sc_version = ns->cs_version;
884
885 LOG (llevDebug, "connection from client <%s>\n", buf);
886
887
888 //TODO: should log here just for statistics
889
941 if (VERSION_CS != ns->cs_version) 890 //if (VERSION_CS != ns->cs_version)
942 { 891 // unchecked;
943#ifdef ESRV_DEBUG 892
944 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
945#endif
946 }
947 cp = strchr (buf + 1, ' '); 893 char *cp = strchr (buf + 1, ' ');
948 if (!cp) 894 if (!cp)
949 return; 895 return;
896
950 ns->sc_version = atoi (cp); 897 ns->sc_version = atoi (cp);
898
951 if (VERSION_SC != ns->sc_version) 899 //if (VERSION_SC != ns->sc_version)
952 { 900 // unchecked;
953#ifdef ESRV_DEBUG 901
954 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
955#endif
956 }
957 cp = strchr (cp + 1, ' '); 902 cp = strchr (cp + 1, ' ');
903
958 if (cp) 904 if (cp)
959 { 905 {
960 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 906 assign (ns->version, cp + 1);
961 907
962 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 908 if (ns->sc_version < 1026)
963 909 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
964 /* This is first implementation - i skip all beta DX clients with it
965 * Add later stuff here for other clients
966 */
967
968 /* these are old dxclients */
969 /* Version 1024 added support for singular + plural name values -
970 * requiing this minimal value reduces complexity of that code, and it
971 * has been around for a long time.
972 */
973 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024)
974 {
975 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
976 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 910 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
977 Write_String_To_Socket (ns, version_warning, strlen (version_warning));
978 }
979
980 } 911 }
981} 912}
982 913
983/** sound related functions. */ 914/** sound related functions. */
984
985void 915void
986SetSound (char *buf, int len, NewSocket * ns) 916SetSound (char *buf, int len, client * ns)
987{ 917{
988 ns->sound = atoi (buf); 918 ns->sound = atoi (buf);
989} 919}
990 920
991/** client wants the map resent */ 921/** client wants the map resent */
992 922
993void 923void
994MapRedrawCmd (char *buf, int len, player *pl) 924MapRedrawCmd (char *buf, int len, player *pl)
995{ 925{
996
997/* This function is currently disabled; just clearing the map state results in 926/* This function is currently disabled; just clearing the map state results in
998 * display errors. It should clear the cache and send a newmap command. 927 * display errors. It should clear the cache and send a newmap command.
999 * Unfortunately this solution does not work because some client versions send 928 * Unfortunately this solution does not work because some client versions send
1000 * a mapredraw command after receiving a newmap command. 929 * a mapredraw command after receiving a newmap command.
1001 */ 930 */
1002#if 0
1003 /* Okay, this is MAJOR UGLY. but the only way I know how to
1004 * clear the "cache"
1005 */
1006 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1007 draw_client_map (pl->ob);
1008#endif
1009} 931}
1010 932
1011/** 933/**
1012 * Moves an object (typically, container to inventory). 934 * Moves an object (typically, container to inventory).
1013 * syntax is: move (to) (tag) (nrof) 935 * syntax is: move (to) (tag) (nrof)
… …
1016MoveCmd (char *buf, int len, player *pl) 938MoveCmd (char *buf, int len, player *pl)
1017{ 939{
1018 int vals[3], i; 940 int vals[3], i;
1019 941
1020 /* A little funky here. We only cycle for 2 records, because 942 /* A little funky here. We only cycle for 2 records, because
1021 * we obviously am not going to find a space after the third 943 * we obviously are not going to find a space after the third
1022 * record. Perhaps we should just replace this with a 944 * record. Perhaps we should just replace this with a
1023 * sscanf? 945 * sscanf?
1024 */ 946 */
1025 for (i = 0; i < 2; i++) 947 for (i = 0; i < 2; i++)
1026 { 948 {
1027 vals[i] = atoi (buf); 949 vals[i] = atoi (buf);
950
1028 if (!(buf = strchr (buf, ' '))) 951 if (!(buf = strchr (buf, ' ')))
1029 { 952 {
1030 LOG (llevError, "Incomplete move command: %s\n", buf); 953 LOG (llevError, "Incomplete move command: %s\n", buf);
1031 return; 954 return;
1032 } 955 }
956
1033 buf++; 957 buf++;
1034 } 958 }
959
1035 vals[2] = atoi (buf); 960 vals[2] = atoi (buf);
1036 961
1037/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 962/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1038 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 963 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1039} 964}
1040
1041
1042 965
1043/****************************************************************************** 966/******************************************************************************
1044 * 967 *
1045 * Start of commands the server sends to the client. 968 * Start of commands the server sends to the client.
1046 * 969 *
… …
1049/** 972/**
1050 * Asks the client to query the user. This way, the client knows 973 * Asks the client to query the user. This way, the client knows
1051 * it needs to send something back (vs just printing out a message) 974 * it needs to send something back (vs just printing out a message)
1052 */ 975 */
1053void 976void
1054send_query (NewSocket * ns, uint8 flags, char *text) 977send_query (client *ns, uint8 flags, char *text)
1055{ 978{
1056 char buf[MAX_BUF];
1057
1058 sprintf (buf, "query %d %s", flags, text ? text : ""); 979 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1059 Write_String_To_Socket (ns, buf, strlen (buf));
1060} 980}
1061 981
1062#define AddIfInt64(Old,New,Type) if (Old != New) {\ 982#define AddIfInt64(Old,New,Type) if (Old != New) {\
1063 Old = New; \ 983 Old = New; \
1064 SockList_AddChar(&sl, Type); \ 984 sl << uint8 (Type) << uint64 (New); \
1065 SockList_AddInt64(&sl, New); \
1066 } 985 }
1067 986
1068#define AddIfInt(Old,New,Type) if (Old != New) {\ 987#define AddIfInt(Old,New,Type) if (Old != New) {\
1069 Old = New; \ 988 Old = New; \
1070 SockList_AddChar(&sl, Type); \ 989 sl << uint8 (Type) << uint32 (New); \
1071 SockList_AddInt(&sl, New); \
1072 } 990 }
1073 991
1074#define AddIfShort(Old,New,Type) if (Old != New) {\ 992#define AddIfShort(Old,New,Type) if (Old != New) {\
1075 Old = New; \ 993 Old = New; \
1076 SockList_AddChar(&sl, Type); \ 994 sl << uint8 (Type) << uint16 (New); \
1077 SockList_AddShort(&sl, New); \
1078 } 995 }
1079 996
1080#define AddIfFloat(Old,New,Type) if (Old != New) {\ 997#define AddIfFloat(Old,New,Type) if (Old != New) {\
1081 Old = New; \ 998 Old = New; \
1082 SockList_AddChar(&sl, Type); \ 999 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1083 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1084 } 1000 }
1085 1001
1086#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1002#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1087 if (Old) free(Old);\
1088 Old = strdup_local(New);\ 1003 free(Old); Old = strdup (New);\
1089 SockList_AddChar(&sl, Type); \ 1004 sl << uint8 (Type) << data8 (New); \
1090 SockList_AddChar(&sl, ( char )strlen(New)); \
1091 strcpy((char*)sl.buf + sl.len, New); \
1092 sl.len += strlen(New); \
1093 } 1005 }
1094 1006
1095/** 1007/**
1096 * Sends a statistics update. We look at the old values, 1008 * Sends a statistics update. We look at the old values,
1097 * and only send what has changed. Stat mapping values are in newclient.h 1009 * and only send what has changed. Stat mapping values are in newclient.h
… …
1099 * commands for now. 1011 * commands for now.
1100 */ 1012 */
1101void 1013void
1102esrv_update_stats (player *pl) 1014esrv_update_stats (player *pl)
1103{ 1015{
1104 SockList sl;
1105 char buf[MAX_BUF]; 1016 char buf[MAX_BUF];
1106 uint16 flags; 1017 uint16 flags;
1107 1018
1108 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1019 packet sl ("stats");
1109 strcpy ((char *) sl.buf, "stats ");
1110 sl.len = strlen ((char *) sl.buf);
1111 1020
1112 if (pl->ob != NULL) 1021 if (pl->ob)
1113 { 1022 {
1114 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1023 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1115 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1024 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1116 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1025 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1117 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1026 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1118 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1027 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1119 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1028 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1120 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1029 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1121 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1122 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1123 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1124 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1030 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1125 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1031 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1032 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1126 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1127 } 1036 }
1128 1037
1129 if (pl->socket.exp64) 1038 if (pl->ns->exp64)
1130 {
1131 uint8 s;
1132
1133 for (s = 0; s < NUM_SKILLS; s++) 1039 for (int s = 0; s < NUM_SKILLS; s++)
1134 {
1135 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1040 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1136 { 1041 {
1137
1138 /* Always send along the level if exp changes. This is only 1042 /* Always send along the level if exp changes. This is only
1139 * 1 extra byte, but keeps processing simpler. 1043 * 1 extra byte, but keeps processing simpler.
1140 */ 1044 */
1141 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1045 sl << uint8 (s + CS_STAT_SKILLINFO)
1142 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1046 << uint8 (pl->last_skill_ob[s]->level)
1143 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1047 << uint64 (pl->last_skill_ob[s]->stats.exp);
1048
1144 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1049 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1145 } 1050 }
1146 }
1147 }
1148 1051
1149 if (pl->socket.exp64) 1052 if (pl->ns->exp64)
1150 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1053 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1151 else 1054 else
1152 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1055 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1153 1056
1154 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1057 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1167 if (pl->run_on) 1070 if (pl->run_on)
1168 flags |= SF_RUNON; 1071 flags |= SF_RUNON;
1169 1072
1170 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1073 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1171 1074
1172 if (pl->socket.sc_version < 1025) 1075 if (pl->ns->sc_version < 1025)
1173 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1076 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1174 else 1077 else
1175 {
1176 int i;
1177
1178 for (i = 0; i < NROFATTACKS; i++) 1078 for (int i = 0; i < NROFATTACKS; i++)
1179 { 1079 {
1180 /* Skip ones we won't send */ 1080 /* Skip ones we won't send */
1181 if (atnr_cs_stat[i] == -1) 1081 if (atnr_cs_stat[i] == -1)
1182 continue; 1082 continue;
1183 1083
1184 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1084 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1185 } 1085 }
1186 }
1187 1086
1188 if (pl->socket.monitor_spells) 1087 if (pl->ns->monitor_spells)
1189 { 1088 {
1190 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1089 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1191 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1090 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1192 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1091 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1193 } 1092 }
1194 1093
1195 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1094 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1196 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1095 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1197 set_title (pl->ob, buf); 1096 set_title (pl->ob, buf);
1198 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1097 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1199 1098
1200 /* Only send it away if we have some actual data */ 1099 /* Only send it away if we have some actual data */
1201 if (sl.len > 6) 1100 if (sl.length () > 6)
1202 { 1101 pl->ns->send_packet (sl);
1203#ifdef ESRV_DEBUG
1204 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1205#endif
1206 Send_With_Handling (&pl->socket, &sl);
1207 }
1208
1209 free (sl.buf);
1210} 1102}
1211 1103
1212/** 1104/**
1213 * Tells the client that here is a player it should start using. 1105 * Tells the client that here is a player it should start using.
1214 */ 1106 */
1215void 1107void
1216esrv_new_player (player *pl, uint32 weight) 1108esrv_new_player (player *pl, uint32 weight)
1217{ 1109{
1218 SockList sl;
1219
1220 pl->last_weight = weight; 1110 pl->last_weight = weight;
1221 1111
1222 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1112 packet sl ("player");
1223 1113
1224 strcpy ((char *) sl.buf, "player "); 1114 sl << uint32 (pl->ob->count)
1225 sl.len = strlen ((char *) sl.buf); 1115 << uint32 (weight)
1226 SockList_AddInt (&sl, pl->ob->count); 1116 << uint32 (pl->ob->face->number)
1227 SockList_AddInt (&sl, weight); 1117 << data8 (pl->ob->name);
1228 SockList_AddInt (&sl, pl->ob->face->number);
1229 1118
1230 SockList_AddChar (&sl, (char) strlen (pl->ob->name)); 1119 pl->ns->send_packet (sl);
1231 strcpy ((char *) sl.buf + sl.len, pl->ob->name);
1232 sl.len += strlen (pl->ob->name);
1233
1234 Send_With_Handling (&pl->socket, &sl);
1235 free (sl.buf);
1236 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1120 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1237} 1121}
1238 1122
1239/** 1123/**
1240 * Need to send an animation sequence to the client. 1124 * Need to send an animation sequence to the client.
… …
1242 * sent them the face yet (this can become quite costly in terms of 1126 * sent them the face yet (this can become quite costly in terms of
1243 * how much we are sending - on the other hand, this should only happen 1127 * how much we are sending - on the other hand, this should only happen
1244 * when the player logs in and picks stuff up. 1128 * when the player logs in and picks stuff up.
1245 */ 1129 */
1246void 1130void
1247esrv_send_animation (NewSocket * ns, short anim_num) 1131esrv_send_animation (client * ns, short anim_num)
1248{ 1132{
1249 SockList sl;
1250 int i;
1251
1252 /* Do some checking on the anim_num we got. Note that the animations 1133 /* Do some checking on the anim_num we got. Note that the animations
1253 * are added in contigous order, so if the number is in the valid 1134 * are added in contigous order, so if the number is in the valid
1254 * range, it must be a valid animation. 1135 * range, it must be a valid animation.
1255 */ 1136 */
1256 if (anim_num < 0 || anim_num > num_animations) 1137 if (anim_num < 0 || anim_num > num_animations)
1257 { 1138 {
1258 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1139 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1259 return; 1140 return;
1260 } 1141 }
1261 1142
1262 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1143 packet sl ("anim");
1263 strcpy ((char *) sl.buf, "anim "); 1144
1264 sl.len = 5; 1145 sl << uint16 (anim_num)
1265 SockList_AddShort (&sl, anim_num); 1146 << uint16 (0); /* flags - not used right now */
1266 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1147
1267 /* Build up the list of faces. Also, send any information (ie, the 1148 /* Build up the list of faces. Also, send any information (ie, the
1268 * the face itself) down to the client. 1149 * the face itself) down to the client.
1269 */ 1150 */
1270 for (i = 0; i < animations[anim_num].num_animations; i++) 1151 for (int i = 0; i < animations[anim_num].num_animations; i++)
1271 { 1152 {
1272 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1153 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1273 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1154 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1155
1274 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1156 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1275 } 1157 }
1276 Send_With_Handling (ns, &sl); 1158
1277 free (sl.buf); 1159 ns->send_packet (sl);
1160
1278 ns->anims_sent[anim_num] = 1; 1161 ns->anims_sent[anim_num] = 1;
1279} 1162}
1280 1163
1281 1164
1282/****************************************************************************** 1165/******************************************************************************
… …
1288/** 1171/**
1289 * This adds face_num to a map cell at x,y. If the client doesn't have 1172 * This adds face_num to a map cell at x,y. If the client doesn't have
1290 * the face yet, we will also send it. 1173 * the face yet, we will also send it.
1291 */ 1174 */
1292static void 1175static void
1293esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1176esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1294{ 1177{
1295 if (newmap->cells[x][y].count >= MAP_LAYERS) 1178 if (newmap->cells[x][y].count >= MAP_LAYERS)
1296 { 1179 {
1180 //TODO: one or the other, can't both have abort and return, verify and act
1297 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1181 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1298 return; 1182 return;
1299 abort (); 1183 abort ();
1300 } 1184 }
1185
1301 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1186 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1302 newmap->cells[x][y].count++; 1187 newmap->cells[x][y].count++;
1188
1303 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1189 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1304 esrv_send_face (ns, face_num, 0); 1190 esrv_send_face (ns, face_num, 0);
1305} 1191}
1306
1307struct LayerCell
1308{
1309 uint16 xy;
1310 short face;
1311};
1312
1313struct MapLayer
1314{
1315 int count;
1316 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1317};
1318
1319/** Checkes if map cells have changed */
1320static int
1321mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1322{
1323 int k;
1324
1325 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1326 return 1;
1327 for (k = 0; k < newmap->cells[i][j].count; k++)
1328 {
1329 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1330 {
1331 return 1;
1332 }
1333 }
1334 return 0;
1335}
1336
1337/**
1338 * Basically, what this does is pack the data into layers.
1339 * cnum is the client number, cur is the the buffer we put all of
1340 * this data into. we return the end of the data. layers is
1341 * how many layers of data we should back.
1342 */
1343static uint8 *
1344compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1345{
1346 int x, y, k;
1347 int face;
1348 unsigned char *fcur;
1349 struct MapLayer layers[MAP_LAYERS];
1350
1351 for (k = 0; k < MAP_LAYERS; k++)
1352 layers[k].count = 0;
1353 fcur = cur;
1354 for (x = 0; x < ns->mapx; x++)
1355 {
1356 for (y = 0; y < ns->mapy; y++)
1357 {
1358 if (!mapcellchanged (ns, x, y, newmap))
1359 continue;
1360 if (newmap->cells[x][y].count == 0)
1361 {
1362 *cur = x * ns->mapy + y; /* mark empty space */
1363 cur++;
1364 continue;
1365 }
1366 for (k = 0; k < newmap->cells[x][y].count; k++)
1367 {
1368 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1369 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1370 layers[k].count++;
1371 }
1372 }
1373 }
1374 /* If no data, return now. */
1375 if (fcur == cur && layers[0].count == 0)
1376 return cur;
1377 *cur = 255; /* mark end of explicitly cleared cells */
1378 cur++;
1379 /* First pack by layers. */
1380 for (k = 0; k < numlayers; k++)
1381 {
1382 if (layers[k].count == 0)
1383 break; /* once a layer is entirely empty, no layer below it can
1384 have anything in it either */
1385 /* Pack by entries in thie layer */
1386 for (x = 0; x < layers[k].count;)
1387 {
1388 fcur = cur;
1389 *cur = layers[k].lcells[x].face >> 8;
1390 cur++;
1391 *cur = layers[k].lcells[x].face & 0xFF;
1392 cur++;
1393 face = layers[k].lcells[x].face;
1394 /* Now, we back the redundant data into 1 byte xy pairings */
1395 for (y = x; y < layers[k].count; y++)
1396 {
1397 if (layers[k].lcells[y].face == face)
1398 {
1399 *cur = (uint8) layers[k].lcells[y].xy;
1400 cur++;
1401 layers[k].lcells[y].face = -1;
1402 }
1403 }
1404 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1405 /* forward over the now redundant data */
1406 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1407 x++;
1408 }
1409 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1410 }
1411 return cur;
1412}
1413
1414static void
1415esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1416{
1417 static long frames, bytes, tbytes, tframes;
1418 char *cur;
1419 SockList sl;
1420
1421
1422 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1423 strcpy ((char *) sl.buf, "map ");
1424 sl.len = strlen ((char *) sl.buf);
1425
1426 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1427 sl.len = cur - (char *) sl.buf;
1428
1429/* LOG(llevDebug, "Sending map command.\n");*/
1430
1431 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1432 {
1433 /* All of this is just accounting stuff */
1434 if (tframes > 100)
1435 tframes = tbytes = 0;
1436
1437 tframes++;
1438 frames++;
1439 tbytes += sl.len;
1440 bytes += sl.len;
1441 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1442 Send_With_Handling (ns, &sl);
1443 ns->sent_scroll = 0;
1444 }
1445
1446 free (sl.buf);
1447}
1448
1449 1192
1450/** Clears a map cell */ 1193/** Clears a map cell */
1451static void 1194static void
1452map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1195map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1453{ 1196{
… …
1464#define MAX_LAYERS 3 1207#define MAX_LAYERS 3
1465 1208
1466/* Using a global really isn't a good approach, but saves the over head of 1209/* Using a global really isn't a good approach, but saves the over head of
1467 * allocating and deallocating such a block of data each time run through, 1210 * allocating and deallocating such a block of data each time run through,
1468 * and saves the space of allocating this in the socket object when we only 1211 * and saves the space of allocating this in the socket object when we only
1469 * need it for this cycle. If the serve is ever threaded, this needs to be 1212 * need it for this cycle. If the server is ever threaded, this needs to be
1470 * re-examined. 1213 * re-examined.
1471 */ 1214 */
1472
1473static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1215static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1474 1216
1475/** 1217/**
1476 * Returns true if any of the heads for this 1218 * Returns true if any of the heads for this
1477 * space is set. Returns false if all are blank - this is used 1219 * space is set. Returns false if all are blank - this is used
1478 * for empty space checking. 1220 * for empty space checking.
1479 */ 1221 */
1480static inline int 1222static inline int
1481have_head (int ax, int ay) 1223have_head (int ax, int ay)
1482{ 1224{
1483
1484 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1225 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1485 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1226 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1486 return 1; 1227 return 1;
1228
1487 return 0; 1229 return 0;
1488} 1230}
1489 1231
1490/** 1232/**
1491 * check_head is a bit simplistic version of update_space below. 1233 * check_head is a bit simplistic version of update_space below.
1492 * basically, it only checks the that the head on space ax,ay at layer 1234 * basically, it only checks the that the head on space ax,ay at layer
1493 * needs to get sent - if so, it adds the data, sending the head 1235 * needs to get sent - if so, it adds the data, sending the head
1494 * if needed, and returning 1. If this no data needs to get 1236 * if needed, and returning 1. If this no data needs to get
1495 * sent, it returns zero. 1237 * sent, it returns zero.
1496 */ 1238 */
1497static int 1239static int
1498check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1240check_head (packet &sl, client &ns, int ax, int ay, int layer)
1499{ 1241{
1500 short face_num; 1242 short face_num;
1501 1243
1502 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1244 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1503 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1245 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1504 else 1246 else
1505 face_num = 0; 1247 face_num = 0;
1506 1248
1507 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1249 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1508 { 1250 {
1509 SockList_AddShort (&sl, face_num); 1251 sl << uint16 (face_num);
1510 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1252 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1511 esrv_send_face (&ns, face_num, 0); 1253 esrv_send_face (&ns, face_num, 0);
1254
1512 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1255 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1513 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1256 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1514 return 1; 1257 return 1;
1515 } 1258 }
1516 1259
… …
1534 * numbers the spaces differently - I think this was a leftover from 1277 * numbers the spaces differently - I think this was a leftover from
1535 * the map command, where the faces stack up. Sinces that is no longer 1278 * the map command, where the faces stack up. Sinces that is no longer
1536 * the case, it seems to make more sense to have these layer values 1279 * the case, it seems to make more sense to have these layer values
1537 * actually match. 1280 * actually match.
1538 */ 1281 */
1539
1540static int 1282static int
1541update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1283update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1542{ 1284{
1543 object *ob, *head; 1285 object *ob, *head;
1544 uint16 face_num; 1286 uint16 face_num;
1545 int bx, by, i; 1287 int bx, by, i;
1546 1288
1547 /* If there is a multipart object stored away, treat that as more important. 1289 /* If there is a multipart object stored away, treat that as more important.
1548 * If not, then do the normal processing. 1290 * If not, then do the normal processing.
1549 */ 1291 */
1550
1551 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1292 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1552 1293
1553 /* Check to see if this head is part of the set of objects 1294 /* Check to see if this head is part of the set of objects
1554 * we would normally send for this space. If so, then 1295 * we would normally send for this space. If so, then
1555 * don't use the head value. We need to do the check 1296 * don't use the head value. We need to do the check
… …
1720 1461
1721 /* Another hack - because of heads and whatnot, this face may match one 1462 /* Another hack - because of heads and whatnot, this face may match one
1722 * we already sent for a lower layer. In that case, don't send 1463 * we already sent for a lower layer. In that case, don't send
1723 * this one. 1464 * this one.
1724 */ 1465 */
1725 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) 1466 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1726 {
1727 face_num = 0; 1467 face_num = 0;
1728 }
1729 1468
1730 /* We've gotten what face we want to use for the object. Now see if 1469 /* We've gotten what face we want to use for the object. Now see if
1731 * if it has changed since we last sent it to the client. 1470 * if it has changed since we last sent it to the client.
1732 */ 1471 */
1733 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1472 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1734 { 1473 {
1735 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1474 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1736 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1475 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1737 esrv_send_face (ns, face_num, 0); 1476 esrv_send_face (&ns, face_num, 0);
1738 SockList_AddShort (sl, face_num); 1477
1478 sl << uint16 (face_num);
1739 return 1; 1479 return 1;
1740 } 1480 }
1481
1741 /* Nothing changed */ 1482 /* Nothing changed */
1742 return 0; 1483 return 0;
1743} 1484}
1744 1485
1745/** 1486/**
… …
1760 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1501 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1761 * take. 1502 * take.
1762 */ 1503 */
1763 1504
1764static inline int 1505static inline int
1765update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1506update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1766{ 1507{
1767 object *ob; 1508 object *ob;
1768 int smoothlevel; /* old face_num; */ 1509 int smoothlevel; /* old face_num; */
1769 1510
1770 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1511 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1775 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1516 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1776 smoothlevel = 0; 1517 smoothlevel = 0;
1777 else 1518 else
1778 { 1519 {
1779 smoothlevel = ob->smoothlevel; 1520 smoothlevel = ob->smoothlevel;
1780 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1521 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1781 SendSmooth (ns, ob->face->number); 1522 SendSmooth (&ns, ob->face->number);
1782 } /* else not already head object or blank face */ 1523 } /* else not already head object or blank face */
1783 1524
1784 /* We've gotten what face we want to use for the object. Now see if 1525 /* We've gotten what face we want to use for the object. Now see if
1785 * if it has changed since we last sent it to the client. 1526 * if it has changed since we last sent it to the client.
1786 */ 1527 */
1787 if (smoothlevel > 255) 1528 if (smoothlevel > 255)
1788 smoothlevel = 255; 1529 smoothlevel = 255;
1789 else if (smoothlevel < 0) 1530 else if (smoothlevel < 0)
1790 smoothlevel = 0; 1531 smoothlevel = 0;
1532
1791 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1533 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1792 { 1534 {
1793 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1535 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1794 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1536 sl << uint8 (smoothlevel);
1795 return 1; 1537 return 1;
1796 } 1538 }
1539
1797 /* Nothing changed */ 1540 /* Nothing changed */
1798 return 0; 1541 return 0;
1799} 1542}
1800 1543
1801/** 1544/**
1802 * Returns the size of a data for a map square as returned by 1545 * Returns the size of a data for a map square as returned by
1803 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1546 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1804 * available. 1547 * available.
1805 */ 1548 */
1806int 1549int
1807getExtendedMapInfoSize (NewSocket * ns) 1550getExtendedMapInfoSize (client * ns)
1808{ 1551{
1809 int result = 0; 1552 int result = 0;
1810 1553
1811 if (ns->ext_mapinfos) 1554 if (ns->ext_mapinfos)
1812 { 1555 {
1813 if (ns->EMI_smooth) 1556 if (ns->EMI_smooth)
1814 result += 1; /*One byte for smoothlevel */ 1557 result += 1; /*One byte for smoothlevel */
1815 } 1558 }
1559
1816 return result; 1560 return result;
1817} 1561}
1818 1562
1819/** 1563/**
1820 * This function uses the new map1 protocol command to send the map 1564 * This function uses the new map1 protocol command to send the map
… …
1827 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1571 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1828 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1572 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1829 * and use the other 4 bits for other informatiion. For full documentation 1573 * and use the other 4 bits for other informatiion. For full documentation
1830 * of what we send, see the doc/Protocol file. 1574 * of what we send, see the doc/Protocol file.
1831 * I will describe internally what we do: 1575 * I will describe internally what we do:
1832 * the socket->lastmap shows how the map last looked when sent to the client. 1576 * the ns->lastmap shows how the map last looked when sent to the client.
1833 * in the lastmap structure, there is a cells array, which is set to the 1577 * in the lastmap structure, there is a cells array, which is set to the
1834 * maximum viewable size (As set in config.h). 1578 * maximum viewable size (As set in config.h).
1835 * in the cells, there are faces and a count value. 1579 * in the cells, there are faces and a count value.
1836 * we use the count value to hold the darkness value. If -1, then this space 1580 * we use the count value to hold the darkness value. If -1, then this space
1837 * is not viewable. 1581 * is not viewable.
… …
1842draw_client_map1 (object *pl) 1586draw_client_map1 (object *pl)
1843{ 1587{
1844 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1588 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1845 sint16 nx, ny; 1589 sint16 nx, ny;
1846 int estartlen, eoldlen; 1590 int estartlen, eoldlen;
1847 SockList sl;
1848 SockList esl; /*For extended Map info */
1849 uint16 mask, emask; 1591 uint16 mask, emask;
1850 uint8 eentrysize; 1592 uint8 eentrysize;
1851 uint16 ewhatstart, ewhatflag; 1593 uint16 ewhatstart, ewhatflag;
1852 uint8 extendedinfos; 1594 uint8 extendedinfos;
1853 maptile *m; 1595 maptile *m;
1854 1596
1855 NewSocket & socket = pl->contr->socket; 1597 client &socket = *pl->contr->ns;
1856 1598
1857 check_map_change (pl->contr); 1599 check_map_change (pl->contr);
1858 1600
1859 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1601 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1860 if (socket.mapmode == Map1Cmd) 1602 packet esl;
1861 strcpy ((char *) sl.buf, "map1 "); 1603
1862 else
1863 strcpy ((char *) sl.buf, "map1a ");
1864 sl.len = strlen ((char *) sl.buf);
1865 startlen = sl.len; 1604 startlen = sl.length ();
1866 1605
1867 /*Extendedmapinfo structure initialisation */ 1606 /*Extendedmapinfo structure initialisation */
1868 if (socket.ext_mapinfos) 1607 if (socket.ext_mapinfos)
1869 { 1608 {
1870 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1871 strcpy ((char *) esl.buf, "mapextended ");
1872 esl.len = strlen ((char *) esl.buf);
1873 extendedinfos = EMI_NOREDRAW; 1609 extendedinfos = EMI_NOREDRAW;
1874 1610
1875 if (socket.EMI_smooth) 1611 if (socket.EMI_smooth)
1876 extendedinfos |= EMI_SMOOTH; 1612 extendedinfos |= EMI_SMOOTH;
1877 1613
1878 ewhatstart = esl.len; 1614 ewhatstart = esl.length ();
1879 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1615 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1880 could need to be taken away */ 1616 could need to be taken away */
1881 SockList_AddChar (&esl, extendedinfos);
1882 eentrysize = getExtendedMapInfoSize (&socket); 1617 eentrysize = getExtendedMapInfoSize (&socket);
1883 SockList_AddChar (&esl, eentrysize); 1618 esl << "mapextended "
1619 << uint8 (extendedinfos)
1620 << uint8 (eentrysize);
1621
1884 estartlen = esl.len; 1622 estartlen = esl.length ();
1885 } 1623 }
1886 else 1624 else
1887 { 1625 {
1888 /* suppress compiler warnings */ 1626 /* suppress compiler warnings */
1889 ewhatstart = 0; 1627 ewhatstart = 0;
… …
1914 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1652 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1915 { 1653 {
1916 ax = 0; 1654 ax = 0;
1917 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1655 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1918 { 1656 {
1919
1920 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1657 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1921 1658
1922 /* If this space is out of the normal viewable area, we only check 1659 /* If this space is out of the normal viewable area, we only check
1923 * the heads value ax or ay will only be greater than what 1660 * the heads value ax or ay will only be greater than what
1924 * the client wants if using the map1a command - this is because 1661 * the client wants if using the map1a command - this is because
… …
1927 */ 1664 */
1928 if (ax >= socket.mapx || ay >= socket.mapy) 1665 if (ax >= socket.mapx || ay >= socket.mapy)
1929 { 1666 {
1930 int i, got_one; 1667 int i, got_one;
1931 1668
1932 oldlen = sl.len; 1669 oldlen = sl.length ();
1933 1670
1934 SockList_AddShort (&sl, mask); 1671 sl << uint16 (mask);
1935 1672
1936 if (check_head (sl, socket, ax, ay, 2)) 1673 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1937 mask |= 0x4;
1938 if (check_head (sl, socket, ax, ay, 1)) 1674 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1939 mask |= 0x2;
1940 if (check_head (sl, socket, ax, ay, 0)) 1675 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1941 mask |= 0x1;
1942 1676
1943 /* If all we are doing is sending 0 (blank) faces, we don't 1677 /* If all we are doing is sending 0 (blank) faces, we don't
1944 * actually need to send that - just the coordinates 1678 * actually need to send that - just the coordinates
1945 * with no faces tells the client to blank out the 1679 * with no faces tells the client to blank out the
1946 * space. 1680 * space.
1947 */ 1681 */
1948 got_one = 0; 1682 got_one = 0;
1949 for (i = oldlen + 2; i < sl.len; i++) 1683 for (i = oldlen + 2; i < sl.length (); i++)
1950 if (sl.buf[i]) 1684 if (sl[i])
1951 got_one = 1; 1685 got_one = 1;
1952 1686
1953 if (got_one && (mask & 0xf)) 1687 if (got_one && (mask & 0xf))
1954 sl.buf[oldlen + 1] = mask & 0xff; 1688 sl[oldlen + 1] = mask & 0xff;
1955 else 1689 else
1956 { /*either all faces blank, either no face at all */ 1690 { /*either all faces blank, either no face at all */
1957 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1691 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1958 sl.len = oldlen + 2; 1692 sl.reset (oldlen + 2);
1959 else 1693 else
1960 sl.len = oldlen; 1694 sl.reset (oldlen);
1961 } 1695 }
1962 1696
1963 /*What concerns extendinfos, nothing to be done for now 1697 /*What concerns extendinfos, nothing to be done for now
1964 * (perhaps effects layer later) 1698 * (perhaps effects layer later)
1965 */ 1699 */
… …
1983 * if this hasn't already been done. If the space is out 1717 * if this hasn't already been done. If the space is out
1984 * of the map, it shouldn't have a head 1718 * of the map, it shouldn't have a head
1985 */ 1719 */
1986 if (lastcell.count != -1) 1720 if (lastcell.count != -1)
1987 { 1721 {
1988 SockList_AddShort (&sl, mask); 1722 sl << uint16 (mask);
1989 map_clearcell (&lastcell, 0, 0, 0, -1); 1723 map_clearcell (&lastcell, 0, 0, 0, -1);
1990 } 1724 }
1991 } 1725 }
1992 else if (d > 3) 1726 else if (d > 3)
1993 { 1727 {
… …
1995 1729
1996 /* This block deals with spaces that are not visible for whatever 1730 /* This block deals with spaces that are not visible for whatever
1997 * reason. Still may need to send the head for this space. 1731 * reason. Still may need to send the head for this space.
1998 */ 1732 */
1999 1733
2000 oldlen = sl.len; 1734 oldlen = sl.length ();
2001 1735
2002 SockList_AddShort (&sl, mask); 1736 sl << uint16 (mask);
2003 1737
2004 if (lastcell.count != -1) 1738 if (lastcell.count != -1)
2005 need_send = 1; 1739 need_send = 1;
2006 1740
2007 count = -1; 1741 count = -1;
2008 1742
2009 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1743 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2010 { 1744 {
2011 /* Now check to see if any heads need to be sent */ 1745 /* Now check to see if any heads need to be sent */
2012 1746
2013 if (check_head (sl, socket, ax, ay, 2)) 1747 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2014 mask |= 0x4;
2015 if (check_head (sl, socket, ax, ay, 1)) 1748 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2016 mask |= 0x2;
2017 if (check_head (sl, socket, ax, ay, 0)) 1749 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2018 mask |= 0x1;
2019 1750
2020 lastcell.count = count; 1751 lastcell.count = count;
2021 } 1752 }
2022 else 1753 else
2023 { 1754 {
… …
2028 1759
2029 map_clearcell (&lastcell, 0, 0, 0, count); 1760 map_clearcell (&lastcell, 0, 0, 0, count);
2030 } 1761 }
2031 1762
2032 if ((mask & 0xf) || need_send) 1763 if ((mask & 0xf) || need_send)
2033 sl.buf[oldlen + 1] = mask & 0xff; 1764 sl[oldlen + 1] = mask & 0xff;
2034 else 1765 else
2035 sl.len = oldlen; 1766 sl.reset (oldlen);
2036 } 1767 }
2037 else 1768 else
2038 { 1769 {
2039 /* In this block, the space is visible or there are head objects 1770 /* In this block, the space is visible or there are head objects
2040 * we need to send. 1771 * we need to send.
… …
2042 1773
2043 /* Rather than try to figure out what everything that we might 1774 /* Rather than try to figure out what everything that we might
2044 * need to send is, then form the packet after that, 1775 * need to send is, then form the packet after that,
2045 * we presume that we will in fact form a packet, and update 1776 * we presume that we will in fact form a packet, and update
2046 * the bits by what we do actually send. If we send nothing, 1777 * the bits by what we do actually send. If we send nothing,
2047 * we just back out sl.len to the old value, and no harm 1778 * we just back out sl.length () to the old value, and no harm
2048 * is done. 1779 * is done.
2049 * I think this is simpler than doing a bunch of checks to see 1780 * I think this is simpler than doing a bunch of checks to see
2050 * what if anything we need to send, setting the bits, then 1781 * what if anything we need to send, setting the bits, then
2051 * doing those checks again to add the real data. 1782 * doing those checks again to add the real data.
2052 */ 1783 */
2053 oldlen = sl.len; 1784 oldlen = sl.length ();
2054 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1785 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2055 eoldlen = esl.len; 1786 eoldlen = esl.length ();
2056 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1787 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2057 SockList_AddShort (&sl, mask); 1788 sl << uint16 (mask);
2058 1789
2059 if (socket.ext_mapinfos) 1790 if (socket.ext_mapinfos)
2060 SockList_AddShort (&esl, emask); 1791 esl << uint16 (emask);
2061 1792
2062 unsigned char dummy; 1793 unsigned char dummy;
2063 unsigned char *last_ext = &dummy; 1794 unsigned char *last_ext = &dummy;
2064 1795
2065 /* Darkness changed */ 1796 /* Darkness changed */
… …
2068 mask |= 0x8; 1799 mask |= 0x8;
2069 1800
2070 if (socket.extmap) 1801 if (socket.extmap)
2071 { 1802 {
2072 *last_ext |= 0x80; 1803 *last_ext |= 0x80;
2073 last_ext = sl.buf + sl.len; 1804 last_ext = &sl[sl.length ()];
2074 SockList_AddChar (&sl, d); 1805 sl << uint8 (d);
2075 } 1806 }
2076 else 1807 else
2077 SockList_AddChar (&sl, 255 - 64 * d); 1808 sl << uint8 (255 - 64 * d);
2078 } 1809 }
2079 1810
2080 lastcell.count = d; 1811 lastcell.count = d;
2081 1812
2082 if (socket.extmap) 1813 if (socket.extmap)
2083 { 1814 {
2084 uint8 stat_hp = 0; 1815 uint8 stat_hp = 0;
2085 uint8 stat_width = 0; 1816 uint8 stat_width = 0;
2086 uint8 flags = 0; 1817 uint8 flags = 0;
2087 tag_t player = 0; 1818 UUID player = 0;
2088 1819
2089 // send hp information, if applicable 1820 // send hp information, if applicable
2090 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1821 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2091 { 1822 {
2092 if (op->head || op->invisible) 1823 if (op->head || op->invisible)
… …
2112 { 1843 {
2113 lastcell.stat_hp = stat_hp; 1844 lastcell.stat_hp = stat_hp;
2114 1845
2115 mask |= 0x8; 1846 mask |= 0x8;
2116 *last_ext |= 0x80; 1847 *last_ext |= 0x80;
2117 last_ext = sl.buf + sl.len; 1848 last_ext = &sl[sl.length ()];
2118 SockList_AddChar (&sl, 5); 1849
2119 SockList_AddChar (&sl, stat_hp); 1850 sl << uint8 (5) << uint8 (stat_hp);
2120 1851
2121 if (stat_width > 1) 1852 if (stat_width > 1)
2122 { 1853 {
2123 *last_ext |= 0x80; 1854 *last_ext |= 0x80;
2124 last_ext = sl.buf + sl.len; 1855 last_ext = &sl[sl.length ()];
2125 SockList_AddChar (&sl, 6); 1856
2126 SockList_AddChar (&sl, stat_width); 1857 sl << uint8 (6) << uint8 (stat_width);
2127 } 1858 }
2128 } 1859 }
2129 1860
2130 if (lastcell.player != player) 1861 if (lastcell.player != player)
2131 { 1862 {
2132 lastcell.player = player; 1863 lastcell.player = player;
2133 1864
2134 mask |= 0x8; 1865 mask |= 0x8;
2135 *last_ext |= 0x80; 1866 *last_ext |= 0x80;
2136 last_ext = sl.buf + sl.len; 1867 last_ext = &sl[sl.length ()];
2137 SockList_AddChar (&sl, 0x47); 1868
2138 SockList_AddChar (&sl, 4); 1869 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2139 SockList_AddInt (&sl, player);
2140 } 1870 }
2141 1871
2142 if (lastcell.flags != flags) 1872 if (lastcell.flags != flags)
2143 { 1873 {
2144 lastcell.flags = flags; 1874 lastcell.flags = flags;
2145 1875
2146 mask |= 0x8; 1876 mask |= 0x8;
2147 *last_ext |= 0x80; 1877 *last_ext |= 0x80;
2148 last_ext = sl.buf + sl.len; 1878 last_ext = &sl[sl.length ()];
2149 SockList_AddChar (&sl, 8); 1879
2150 SockList_AddChar (&sl, flags); 1880 sl << uint8 (8) << uint8 (flags);
2151 } 1881 }
2152 } 1882 }
2153 1883
2154 /* Floor face */ 1884 /* Floor face */
2155 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 1885 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2156 mask |= 0x4; 1886 mask |= 0x4;
2157 1887
2158 if (socket.EMI_smooth) 1888 if (socket.EMI_smooth)
2159 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 1889 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2160 emask |= 0x4; 1890 emask |= 0x4;
2161 1891
2162 /* Middle face */ 1892 /* Middle face */
2163 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 1893 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2164 mask |= 0x2; 1894 mask |= 0x2;
2165 1895
2166 if (socket.EMI_smooth) 1896 if (socket.EMI_smooth)
2167 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 1897 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2168 emask |= 0x2; 1898 emask |= 0x2;
2169 1899
2170 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1900 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2171 { 1901 {
2172 if (lastcell.faces[0] != pl->face->number) 1902 if (lastcell.faces[0] != pl->face->number)
… …
2175 mask |= 0x1; 1905 mask |= 0x1;
2176 1906
2177 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1907 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2178 esrv_send_face (&socket, pl->face->number, 0); 1908 esrv_send_face (&socket, pl->face->number, 0);
2179 1909
2180 SockList_AddShort (&sl, pl->face->number); 1910 sl << uint16 (pl->face->number);
2181 } 1911 }
2182 } 1912 }
2183 else 1913 else
2184 { 1914 {
2185 /* Top face */ 1915 /* Top face */
2186 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 1916 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2187 mask |= 0x1; 1917 mask |= 0x1;
2188 1918
2189 if (socket.EMI_smooth) 1919 if (socket.EMI_smooth)
2190 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 1920 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2191 emask |= 0x1; 1921 emask |= 0x1;
2192 } 1922 }
2193 1923
2194 /* Check to see if we are in fact sending anything for this 1924 /* Check to see if we are in fact sending anything for this
2195 * space by checking the mask. If so, update the mask. 1925 * space by checking the mask. If so, update the mask.
2196 * if not, reset the len to that from before adding the mask 1926 * if not, reset the len to that from before adding the mask
2197 * value, so we don't send those bits. 1927 * value, so we don't send those bits.
2198 */ 1928 */
2199 if (mask & 0xf) 1929 if (mask & 0xf)
2200 sl.buf[oldlen + 1] = mask & 0xff; 1930 sl[oldlen + 1] = mask & 0xff;
2201 else 1931 else
2202 sl.len = oldlen; 1932 sl.reset (oldlen);
2203 1933
2204 if (emask & 0xf) 1934 if (emask & 0xf)
2205 esl.buf[eoldlen + 1] = emask & 0xff; 1935 esl[eoldlen + 1] = emask & 0xff;
2206 else 1936 else
2207 esl.len = eoldlen; 1937 esl.reset (eoldlen);
2208 } /* else this is a viewable space */ 1938 } /* else this is a viewable space */
2209 } /* for x loop */ 1939 } /* for x loop */
2210 } /* for y loop */ 1940 } /* for y loop */
2211 1941
2212 /* Verify that we in fact do need to send this */ 1942 /* Verify that we in fact do need to send this */
2213 if (socket.ext_mapinfos) 1943 if (socket.ext_mapinfos)
2214 { 1944 {
2215 if (!(sl.len > startlen || socket.sent_scroll)) 1945 if (!(sl.length () > startlen || socket.sent_scroll))
2216 { 1946 {
2217 /* No map data will follow, so don't say the client 1947 /* No map data will follow, so don't say the client
2218 * it doesn't need draw! 1948 * it doesn't need draw!
2219 */ 1949 */
2220 ewhatflag &= (~EMI_NOREDRAW); 1950 ewhatflag &= (~EMI_NOREDRAW);
2221 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1951 esl[ewhatstart + 1] = ewhatflag & 0xff;
2222 } 1952 }
2223 1953
2224 if (esl.len > estartlen) 1954 if (esl.length () > estartlen)
2225 Send_With_Handling (&socket, &esl); 1955 socket.send_packet (esl);
2226
2227 free (esl.buf);
2228 } 1956 }
2229 1957
2230 if (sl.len > startlen || socket.sent_scroll) 1958 if (sl.length () > startlen || socket.sent_scroll)
2231 { 1959 {
2232 Send_With_Handling (&socket, &sl); 1960 socket.send_packet (sl);
2233 socket.sent_scroll = 0; 1961 socket.sent_scroll = 0;
2234 } 1962 }
2235
2236 free (sl.buf);
2237} 1963}
2238 1964
2239/** 1965/**
2240 * Draws client map. 1966 * Draws client map.
2241 */ 1967 */
… …
2265 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1991 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2266 return; 1992 return;
2267 1993
2268 memset (&newmap, 0, sizeof (struct Map)); 1994 memset (&newmap, 0, sizeof (struct Map));
2269 1995
2270 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 1996 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2271 {
2272 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 1997 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2273 { 1998 {
2274 ax = i; 1999 ax = i;
2275 ay = j; 2000 ay = j;
2276 m = pm; 2001 m = pm;
2277 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2002 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2003
2278 if (mflags & P_OUT_OF_MAP) 2004 if (mflags & P_OUT_OF_MAP)
2279 continue; 2005 continue;
2280 if (mflags & P_NEED_UPDATE) 2006
2281 update_position (m, ax, ay);
2282 /* If a map is visible to the player, we don't want to swap it out 2007 /* If a map is visible to the player, we don't want to swap it out
2283 * just to reload it. This should really call something like 2008 * just to reload it. This should really call something like
2284 * swap_map, but this is much more efficient and 'good enough' 2009 * swap_map, but this is much more efficient and 'good enough'
2285 */ 2010 */
2286 if (mflags & P_NEW_MAP) 2011 if (mflags & P_NEW_MAP)
2287 m->timeout = 50; 2012 m->timeout = 50;
2288 } 2013 }
2289 } 2014
2290 /* do LOS after calls to update_position */ 2015 /* do LOS after calls to update_position */
2291 if (pl->contr->do_los) 2016 if (pl->contr->do_los)
2292 { 2017 {
2293 update_los (pl); 2018 update_los (pl);
2294 pl->contr->do_los = 0; 2019 pl->contr->do_los = 0;
2295 } 2020 }
2296 2021
2297 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2298 {
2299 /* Big maps need a different drawing mechanism to work */ 2022 /* Big maps need a different drawing mechanism to work */
2300 draw_client_map1 (pl); 2023 draw_client_map1 (pl);
2301 return;
2302 }
2303
2304 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2305 {
2306 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2307 }
2308
2309 /* j and i are the y and x coordinates of the real map (which is
2310 * basically some number of spaces around the player)
2311 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2312 * left corner) and are thus disconnected from the map values.
2313 * Subtract 1 from the max values so that we properly handle cases where
2314 * player has specified an even map. Otherwise, we try to send them too
2315 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2316 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2317 * odd, this still works fine.
2318 */
2319 ay = 0;
2320 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2321 {
2322 ax = 0;
2323 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2324 {
2325
2326 d = pl->contr->blocked_los[ax][ay];
2327 /* note the out_of_map and d>3 checks are both within the same
2328 * negation check.
2329 */
2330 nx = i;
2331 ny = j;
2332 m = get_map_from_coord (pm, &nx, &ny);
2333 if (m && d < 4)
2334 {
2335 face = GET_MAP_FACE (m, nx, ny, 0);
2336 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2337 floor = GET_MAP_FACE (m, nx, ny, 2);
2338
2339 /* If all is blank, send a blank face. */
2340 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2341 {
2342 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2343 }
2344 else
2345 { /* actually have something interesting */
2346 /* send the darkness mask, if any. */
2347 if (d && pl->contr->socket.darkness)
2348 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2349
2350 if (face && face != blank_face)
2351 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2352 if (floor2 && floor2 != blank_face)
2353 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2354 if (floor && floor != blank_face)
2355 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2356 }
2357 } /* Is a valid space */
2358 }
2359 }
2360 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2361
2362 check_map_change (pl->contr);
2363} 2024}
2364 2025
2365 2026
2366/*****************************************************************************/ 2027/*****************************************************************************/
2367 2028
… …
2373 2034
2374/*****************************************************************************/ 2035/*****************************************************************************/
2375void 2036void
2376send_plugin_custom_message (object *pl, char *buf) 2037send_plugin_custom_message (object *pl, char *buf)
2377{ 2038{
2378 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2039 pl->contr->ns->send_packet (buf);
2379} 2040}
2380 2041
2381/** 2042/**
2382 * This sends the skill number to name mapping. We ignore 2043 * This sends the skill number to name mapping. We ignore
2383 * the params - we always send the same info no matter what. 2044 * the params - we always send the same info no matter what.
2384 */ 2045 */
2385void 2046void
2386send_skill_info (NewSocket * ns, char *params) 2047send_skill_info (client *ns, char *params)
2387{ 2048{
2388 SockList sl; 2049 packet sl;
2389 int i; 2050 sl << "replyinfo skill_info\n";
2390 2051
2391 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2392 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2393 for (i = 1; i < NUM_SKILLS; i++) 2052 for (int i = 1; i < NUM_SKILLS; i++)
2394 { 2053 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2395 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2054
2396 }
2397 sl.len = strlen ((char *) sl.buf);
2398 if (sl.len >= MAXSOCKBUF) 2055 if (sl.length () >= MAXSOCKBUF)
2399 { 2056 {
2400 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2057 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2401 fatal (0); 2058 fatal (0);
2402 } 2059 }
2403 Send_With_Handling (ns, &sl); 2060
2404 free (sl.buf); 2061 ns->send_packet (sl);
2405} 2062}
2406 2063
2407/** 2064/**
2408 * This sends the spell path to name mapping. We ignore 2065 * This sends the spell path to name mapping. We ignore
2409 * the params - we always send the same info no matter what. 2066 * the params - we always send the same info no matter what.
2410 */ 2067 */
2411void 2068void
2412send_spell_paths (NewSocket * ns, char *params) 2069send_spell_paths (client * ns, char *params)
2413{ 2070{
2414 SockList sl; 2071 packet sl;
2415 int i;
2416 2072
2417 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2073 sl << "replyinfo spell_paths\n";
2418 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2074
2419 for (i = 0; i < NRSPELLPATHS; i++) 2075 for (int i = 0; i < NRSPELLPATHS; i++)
2420 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2076 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2421 sl.len = strlen ((char *) sl.buf); 2077
2422 if (sl.len >= MAXSOCKBUF) 2078 if (sl.length () >= MAXSOCKBUF)
2423 { 2079 {
2424 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2080 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2425 fatal (0); 2081 fatal (0);
2426 } 2082 }
2427 Send_With_Handling (ns, &sl); 2083
2428 free (sl.buf); 2084 ns->send_packet (sl);
2429} 2085}
2430 2086
2431/** 2087/**
2432 * This looks for any spells the player may have that have changed their stats. 2088 * This looks for any spells the player may have that have changed their stats.
2433 * it then sends an updspell packet for each spell that has changed in this way 2089 * it then sends an updspell packet for each spell that has changed in this way
2434 */ 2090 */
2435void 2091void
2436esrv_update_spells (player *pl) 2092esrv_update_spells (player *pl)
2437{ 2093{
2438 SockList sl;
2439 int flags = 0;
2440 object *spell;
2441
2442 if (!pl->socket.monitor_spells) 2094 if (!pl->ns->monitor_spells)
2443 return; 2095 return;
2096
2444 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2097 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2445 { 2098 {
2446 if (spell->type == SPELL) 2099 if (spell->type == SPELL)
2447 { 2100 {
2101 int flags = 0;
2102
2448 /* check if we need to update it */ 2103 /* check if we need to update it */
2449 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2104 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2450 { 2105 {
2451 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2106 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2452 flags |= UPD_SP_MANA; 2107 flags |= UPD_SP_MANA;
2453 } 2108 }
2109
2454 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2110 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2455 { 2111 {
2456 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2112 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2457 flags |= UPD_SP_GRACE; 2113 flags |= UPD_SP_GRACE;
2458 } 2114 }
2115
2459 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2116 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2460 { 2117 {
2461 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2118 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2462 flags |= UPD_SP_DAMAGE; 2119 flags |= UPD_SP_DAMAGE;
2463 } 2120 }
2121
2464 if (flags != 0) 2122 if (flags)
2465 { 2123 {
2466 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2124 packet sl;
2467 strcpy ((char *) sl.buf, "updspell "); 2125
2468 sl.len = strlen ((char *) sl.buf); 2126 sl << "updspell "
2469 SockList_AddChar (&sl, flags); 2127 << uint8 (flags)
2470 SockList_AddInt (&sl, spell->count); 2128 << uint32 (spell->count);
2471 if (flags & UPD_SP_MANA) 2129
2472 SockList_AddShort (&sl, spell->last_sp); 2130 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2473 if (flags & UPD_SP_GRACE) 2131 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2474 SockList_AddShort (&sl, spell->last_grace); 2132 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2475 if (flags & UPD_SP_DAMAGE) 2133
2476 SockList_AddShort (&sl, spell->last_eat); 2134 pl->ns->send_packet (sl);
2477 flags = 0;
2478 Send_With_Handling (&pl->socket, &sl);
2479 free (sl.buf);
2480 } 2135 }
2481 } 2136 }
2482 } 2137 }
2483} 2138}
2484 2139
2485void 2140void
2486esrv_remove_spell (player *pl, object *spell) 2141esrv_remove_spell (player *pl, object *spell)
2487{ 2142{
2488 SockList sl;
2489
2490 if (!pl->socket.monitor_spells) 2143 if (!pl->ns->monitor_spells)
2491 return; 2144 return;
2145
2492 if (!pl || !spell || spell->env != pl->ob) 2146 if (!pl || !spell || spell->env != pl->ob)
2493 { 2147 {
2494 LOG (llevError, "Invalid call to esrv_remove_spell"); 2148 LOG (llevError, "Invalid call to esrv_remove_spell");
2495 return; 2149 return;
2496 } 2150 }
2497 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2151
2498 strcpy ((char *) sl.buf, "delspell "); 2152 packet sl ("delspell");
2499 sl.len = strlen ((char *) sl.buf); 2153
2500 SockList_AddInt (&sl, spell->count); 2154 sl << uint32 (spell->count);
2501 Send_With_Handling (&pl->socket, &sl); 2155
2502 free (sl.buf); 2156 pl->ns->send_packet (sl);
2503} 2157}
2504 2158
2505/* appends the spell *spell to the Socklist we will send the data to. */ 2159/* appends the spell *spell to the Socklist we will send the data to. */
2506static void 2160static void
2507append_spell (player *pl, SockList * sl, object *spell) 2161append_spell (player *pl, packet &sl, object *spell)
2508{ 2162{
2509 int len, i, skill = 0; 2163 int len, i, skill = 0;
2510 2164
2511 if (!(spell->name)) 2165 if (!(spell->name))
2512 { 2166 {
2513 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2167 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2514 return; 2168 return;
2515 } 2169 }
2516 SockList_AddInt (sl, spell->count); 2170
2517 SockList_AddShort (sl, spell->level);
2518 SockList_AddShort (sl, spell->casting_time);
2519 /* store costs and damage in the object struct, to compare to later */ 2171 /* store costs and damage in the object struct, to compare to later */
2520 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2172 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2521 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2173 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2522 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2174 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2523 /* send the current values */
2524 SockList_AddShort (sl, spell->last_sp);
2525 SockList_AddShort (sl, spell->last_grace);
2526 SockList_AddShort (sl, spell->last_eat);
2527 2175
2528 /* figure out which skill it uses, if it uses one */ 2176 /* figure out which skill it uses, if it uses one */
2529 if (spell->skill) 2177 if (spell->skill)
2530 { 2178 {
2531 for (i = 1; i < NUM_SKILLS; i++) 2179 for (i = 1; i < NUM_SKILLS; i++)
… …
2533 { 2181 {
2534 skill = i + CS_STAT_SKILLINFO; 2182 skill = i + CS_STAT_SKILLINFO;
2535 break; 2183 break;
2536 } 2184 }
2537 } 2185 }
2538 SockList_AddChar (sl, skill);
2539 2186
2540 SockList_AddInt (sl, spell->path_attuned); 2187 /* send the current values */
2188 sl << uint32 (spell->count)
2189 << uint16 (spell->level)
2190 << uint16 (spell->casting_time)
2191 << uint16 (spell->last_sp)
2192 << uint16 (spell->last_grace)
2193 << uint16 (spell->last_eat)
2194 << uint8 (skill)
2195 << uint32 (spell->path_attuned)
2541 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2196 << uint32 (spell->face ? spell->face->number : 0)
2542 2197 << data8 (spell->name)
2543 len = strlen (spell->name); 2198 << data16 (spell->msg);
2544 SockList_AddChar (sl, (char) len);
2545 memcpy (sl->buf + sl->len, spell->name, len);
2546 sl->len += len;
2547
2548 if (!spell->msg)
2549 {
2550 SockList_AddShort (sl, 0);
2551 }
2552 else
2553 {
2554 len = strlen (spell->msg);
2555 SockList_AddShort (sl, len);
2556 memcpy (sl->buf + sl->len, spell->msg, len);
2557 sl->len += len;
2558 }
2559} 2199}
2560 2200
2561/** 2201/**
2562 * This tells the client to add the spell *ob, if *ob is NULL, then add 2202 * This tells the client to add the spell *ob, if *ob is NULL, then add
2563 * all spells in the player's inventory. 2203 * all spells in the player's inventory.
2564 */ 2204 */
2565void 2205void
2566esrv_add_spells (player *pl, object *spell) 2206esrv_add_spells (player *pl, object *spell)
2567{ 2207{
2568 SockList sl;
2569
2570 if (!pl) 2208 if (!pl)
2571 { 2209 {
2572 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2210 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2573 return; 2211 return;
2574 } 2212 }
2213
2575 if (!pl->socket.monitor_spells) 2214 if (!pl->ns->monitor_spells)
2576 return; 2215 return;
2577 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2216
2578 strcpy ((char *) sl.buf, "addspell "); 2217 packet sl ("addspell");
2579 sl.len = strlen ((char *) sl.buf); 2218
2580 if (!spell) 2219 if (!spell)
2581 { 2220 {
2582 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2221 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2583 { 2222 {
2584 /* were we to simply keep appending data here, we could exceed 2223 /* were we to simply keep appending data here, we could exceed
… …
2594 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 2233 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2595 * like it will fix this 2234 * like it will fix this
2596 */ 2235 */
2597 if (spell->type != SPELL) 2236 if (spell->type != SPELL)
2598 continue; 2237 continue;
2238
2599 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2239 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2600 { 2240 {
2601 Send_With_Handling (&pl->socket, &sl); 2241 pl->ns->send_packet (sl);
2602 strcpy ((char *) sl.buf, "addspell "); 2242
2603 sl.len = strlen ((char *) sl.buf); 2243 sl.reset ();
2244 sl << "addspell ";
2604 } 2245 }
2246
2605 append_spell (pl, &sl, spell); 2247 append_spell (pl, sl, spell);
2606 } 2248 }
2607 } 2249 }
2608 else if (spell->type != SPELL) 2250 else if (spell->type != SPELL)
2609 { 2251 {
2610 LOG (llevError, "Asked to send a non-spell object as a spell"); 2252 LOG (llevError, "Asked to send a non-spell object as a spell");
2611 return; 2253 return;
2612 } 2254 }
2613 else 2255 else
2614 append_spell (pl, &sl, spell); 2256 append_spell (pl, sl, spell);
2257
2615 if (sl.len >= MAXSOCKBUF) 2258 if (sl.length () >= MAXSOCKBUF)
2616 { 2259 {
2617 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2260 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2618 fatal (0); 2261 fatal (0);
2619 } 2262 }
2263
2620 /* finally, we can send the packet */ 2264 /* finally, we can send the packet */
2621 Send_With_Handling (&pl->socket, &sl); 2265 pl->ns->send_packet (sl);
2622 free (sl.buf);
2623} 2266}
2267

Diff Legend

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