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.29 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.49 by root, Thu Dec 21 06:12:37 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->socket->lastmap, 0, sizeof (pl->socket->lastmap));
164 144
165 if (socket.newmapcmd == 1) 145 if (pl->socket->newmapcmd == 1)
166 Write_String_To_Socket (&socket, "newmap", 6); 146 pl->socket->send_packet ("newmap");
167 147
168 socket.update_look = 1; 148 pl->socket->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->socket;
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->socket->mapx / 2 - pl->ob->x;
258 int mapy = pl->socket.mapy / 2 - pl->ob->y; 286 int mapy = pl->socket->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->socket->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 if (INVOKE_CLIENT (ADDME, ns))
575 return;
540 576
541 oldsettings = settings;
542 if (ns->status != Ns_Add || add_player (ns)) 577 if (ns->pl || add_player (ns))
543 { 578 ns->send_packet ("addme_failed");
544 Write_String_To_Socket (ns, "addme_failed", 12);
545 }
546 else 579 else
547 { 580 ns->send_packet ("addme_success");
548 /* Basically, the add_player copies the socket structure into
549 * the player structure, so this one (which is from init_sockets)
550 * is not needed anymore. The write below should still work, as the
551 * stuff in ns is still relevant.
552 */
553 Write_String_To_Socket (ns, "addme_success", 13);
554 socket_info.nconns--;
555 ns->status = Ns_Avail;
556 }
557 settings = oldsettings;
558} 581}
559 582
560/** Reply to ExtendedInfos command */ 583/** Reply to ExtendedInfos command */
561void 584void
562ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 585ToggleExtendedInfos (char *buf, int len, client * ns)
563{ 586{
564 char cmdback[MAX_BUF]; 587 char cmdback[MAX_BUF];
565 char command[50]; 588 char command[50];
566 int info, nextinfo; 589 int info, nextinfo;
567 590
… …
605 { 628 {
606 strcat (cmdback, " "); 629 strcat (cmdback, " ");
607 strcat (cmdback, "smoothing"); 630 strcat (cmdback, "smoothing");
608 } 631 }
609 632
610 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 633 ns->send_packet (cmdback);
611} 634}
612 635
613/* 636/*
614#define MSG_TYPE_BOOK 1 637#define MSG_TYPE_BOOK 1
615#define MSG_TYPE_CARD 2 638#define MSG_TYPE_CARD 2
… …
618#define MSG_TYPE_MONUMENT 5 641#define MSG_TYPE_MONUMENT 5
619#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 642#define MSG_TYPE_SCRIPTED_DIALOG 6*/
620 643
621/** Reply to ExtendedInfos command */ 644/** Reply to ExtendedInfos command */
622void 645void
623ToggleExtendedText (char *buf, int len, NewSocket * ns) 646ToggleExtendedText (char *buf, int len, client * ns)
624{ 647{
625 char cmdback[MAX_BUF]; 648 char cmdback[MAX_BUF];
626 char temp[10]; 649 char temp[10];
627 char command[50]; 650 char command[50];
628 int info, nextinfo, i, flag; 651 int info, nextinfo, i, flag;
… …
668 strcat (cmdback, " "); 691 strcat (cmdback, " ");
669 snprintf (temp, sizeof (temp), "%d", i); 692 snprintf (temp, sizeof (temp), "%d", i);
670 strcat (cmdback, temp); 693 strcat (cmdback, temp);
671 } 694 }
672 695
673 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 696 ns->send_packet (cmdback);
674} 697}
675 698
676/** 699/**
677 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 700 * 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 701 * 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 702 * 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 703 * if we know the client wants it, might as well push it to the
681 * client. 704 * client.
682 */ 705 */
683static void 706static void
684SendSmooth (NewSocket * ns, uint16 face) 707SendSmooth (client *ns, uint16 face)
685{ 708{
686 uint16 smoothface; 709 uint16 smoothface;
687 710
688 /* If we can't find a face, return and set it so we won't try to send this 711 /* If we can't find a face, return and set it so we won't try to send this
689 * again. 712 * again.
… …
699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 722 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
700 esrv_send_face (ns, smoothface, 0); 723 esrv_send_face (ns, smoothface, 0);
701 724
702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 725 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
703 726
704 SockList sl (MAXSOCKBUF); 727 packet sl ("smooth");
705 728
706 sl << "smooth "
707 << uint16 (face) 729 sl << uint16 (face)
708 << uint16 (smoothface); 730 << uint16 (smoothface);
709 731
710 Send_With_Handling (ns, &sl); 732 ns->send_packet (sl);
711 sl.free ();
712} 733}
713 734
714 /** 735 /**
715 * Tells client the picture it has to use 736 * Tells client the picture it has to use
716 * to smooth a picture number given as argument. 737 * to smooth a picture number given as argument.
717 */ 738 */
718void 739void
719AskSmooth (char *buf, int len, NewSocket * ns) 740AskSmooth (char *buf, int len, client *ns)
720{ 741{
721 uint16 facenbr; 742 SendSmooth (ns, atoi (buf));
722
723 facenbr = atoi (buf);
724 SendSmooth (ns, facenbr);
725} 743}
726 744
727/** 745/**
728 * This handles the general commands from the client (ie, north, fire, cast, 746 * This handles the general commands from the client (ie, north, fire, cast,
729 * etc.) 747 * etc.)
730 */ 748 */
731void 749void
732PlayerCmd (char *buf, int len, player *pl) 750PlayerCmd (char *buf, int len, player *pl)
733{ 751{
734
735 /* The following should never happen with a proper or honest client.
736 * Therefore, the error message doesn't have to be too clear - if
737 * someone is playing with a hacked/non working client, this gives them
738 * an idea of the problem, but they deserve what they get
739 */
740 if (pl->state != ST_PLAYING)
741 {
742 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
743 return;
744 }
745 /* Check if there is a count. In theory, a zero count could also be 752 /* Check if there is a count. In theory, a zero count could also be
746 * sent, so check for that also. 753 * sent, so check for that also.
747 */ 754 */
748 if (atoi (buf) || buf[0] == '0') 755 if (atoi (buf) || buf[0] == '0')
749 { 756 {
750 pl->count = atoi ((char *) buf); 757 pl->count = atoi ((char *) buf);
758
751 buf = strchr (buf, ' '); /* advance beyond the numbers */ 759 buf = strchr (buf, ' '); /* advance beyond the numbers */
752 if (!buf) 760 if (!buf)
753 {
754#ifdef ESRV_DEBUG
755 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
756#endif
757 return; 761 return;
758 } 762
759 buf++; 763 buf++;
760 } 764 }
761 /* This should not happen anymore. */ 765
762 if (pl->ob->speed_left < -1.0)
763 {
764 LOG (llevError, "Player has negative time - shouldn't do command.\n");
765 }
766 /* In c_new.c */
767 execute_newserver_command (pl->ob, (char *) buf); 766 execute_newserver_command (pl->ob, (char *) buf);
767
768 /* Perhaps something better should be done with a left over count. 768 /* Perhaps something better should be done with a left over count.
769 * Cleaning up the input should probably be done first - all actions 769 * Cleaning up the input should probably be done first - all actions
770 * for the command that issued the count should be done before any other 770 * for the command that issued the count should be done before any other
771 * commands. 771 * commands.
772 */ 772 */
773
774 pl->count = 0; 773 pl->count = 0;
775
776} 774}
777 775
778 776
779/** 777/**
780 * This handles the general commands from the client (ie, north, fire, cast, 778 * This handles the general commands from the client (ie, north, fire, cast,
781 * etc.). It is a lot like PlayerCmd above, but is called with the 779 * etc.). It is a lot like PlayerCmd above, but is called with the
782 * 'ncom' method which gives more information back to the client so it 780 * 'ncom' method which gives more information back to the client so it
783 * can throttle. 781 * can throttle.
784 */ 782 */
785void 783void
786NewPlayerCmd (uint8 * buf, int len, player *pl) 784NewPlayerCmd (char *buf, int len, player *pl)
787{ 785{
788 int time, repeat;
789 char command[MAX_BUF];
790 short packet;
791
792 if (len < 7) 786 if (len <= 6)
793 { 787 {
794 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 788 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
795 return; 789 return;
796 } 790 }
797 791
798 packet = GetShort_String (buf); 792 uint16 cmdid = net_uint16 ((uint8 *)buf);
799 repeat = GetInt_String (buf + 2); 793 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
794
800 /* -1 is special - no repeat, but don't update */ 795 /* -1 is special - no repeat, but don't update */
801 if (repeat != -1) 796 if (repeat != -1)
802 pl->count = repeat; 797 pl->count = repeat;
803 798
804 if ((len - 4) >= MAX_BUF) 799 buf += 6; //len -= 6;
805 len = MAX_BUF - 5;
806 800
807 strncpy ((char *) command, (char *) buf + 6, len - 4);
808 command[len - 4] = '\0';
809
810 /* The following should never happen with a proper or honest client.
811 * Therefore, the error message doesn't have to be too clear - if
812 * someone is playing with a hacked/non working client, this gives them
813 * an idea of the problem, but they deserve what they get
814 */
815 if (pl->state != ST_PLAYING)
816 {
817 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
818 return;
819 }
820
821 /* This should not happen anymore. */
822 if (pl->ob->speed_left < -1.0)
823 LOG (llevError, "Player has negative time - shouldn't do command.\n");
824
825 /* In c_new.c */
826 execute_newserver_command (pl->ob, (char *) command); 801 execute_newserver_command (pl->ob, buf);
802
827 /* Perhaps something better should be done with a left over count. 803 /* Perhaps something better should be done with a left over count.
828 * Cleaning up the input should probably be done first - all actions 804 * Cleaning up the input should probably be done first - all actions
829 * for the command that issued the count should be done before any other 805 * for the command that issued the count should be done before any other
830 * commands. 806 * commands.
831 */ 807 */
832 pl->count = 0; 808 pl->count = 0;
833 809
810 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
834 if (FABS (pl->ob->speed) < 0.001) 811 int time = FABS (pl->ob->speed) < 0.001
835 time = MAX_TIME * 100; 812 ? time = MAX_TIME * 100
836 else
837 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 813 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
838 814
839 /* Send confirmation of command execution now */ 815 /* Send confirmation of command execution now */
840 816 packet sl ("comc");
841 SockList sl (MAXSOCKBUF);
842 sl << "comc " << uint16 (packet) << uint32 (time); 817 sl << uint16 (cmdid) << uint32 (time);
843 Send_With_Handling (&pl->socket, &sl); 818 pl->socket->send_packet (sl);
844 sl.free ();
845} 819}
846
847 820
848/** This is a reply to a previous query. */ 821/** This is a reply to a previous query. */
849void 822void
850ReplyCmd (char *buf, int len, player *pl) 823ReplyCmd (char *buf, int len, client *ns)
851{ 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
852 /* 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
853 * 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
854 * once all the X11 code is removed from the server. 833 * once all the X11 code is removed from the server.
855 * 834 *
856 * 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
857 * think it was the carriage return that was entered, and the 836 * think it was the carriage return that was entered, and the
858 * function then does not try to do additional input. 837 * function then does not try to do additional input.
… …
861 840
862 /* this avoids any hacking here */ 841 /* this avoids any hacking here */
863 842
864 switch (pl->state) 843 switch (pl->state)
865 { 844 {
866 case ST_PLAYING: 845 case ST_PLAYING:
867 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 846 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
868 break; 847 break;
869 848
870 case ST_PLAY_AGAIN: 849 case ST_PLAY_AGAIN:
871 /* We can check this for return value (2==quit). Maybe we 850 /* We can check this for return value (2==quit). Maybe we
872 * should, and do something appropriate? 851 * should, and do something appropriate?
873 */ 852 */
874 receive_play_again (pl->ob, buf[0]); 853 receive_play_again (pl->ob, buf[0]);
875 break; 854 break;
876 855
877 case ST_ROLL_STAT: 856 case ST_ROLL_STAT:
878 key_roll_stat (pl->ob, buf[0]); 857 key_roll_stat (pl->ob, buf[0]);
879 break; 858 break;
880 859
881 case ST_CHANGE_CLASS: 860 case ST_CHANGE_CLASS:
882
883 key_change_class (pl->ob, buf[0]); 861 key_change_class (pl->ob, buf[0]);
884 break; 862 break;
885 863
886 case ST_CONFIRM_QUIT: 864 case ST_CONFIRM_QUIT:
887 key_confirm_quit (pl->ob, buf[0]); 865 key_confirm_quit (pl->ob, buf[0]);
888 break; 866 break;
889 867
890 case ST_CONFIGURE: 868 case ST_CONFIGURE:
891 LOG (llevError, "In client input handling, but into configure state\n"); 869 LOG (llevError, "In client input handling, but into configure state\n");
892 pl->state = ST_PLAYING; 870 pl->state = ST_PLAYING;
893 break; 871 break;
894 872
895 case ST_GET_NAME: 873 case ST_GET_NAME:
896 receive_player_name (pl->ob, 13); 874 receive_player_name (pl->ob, 13);
897 break; 875 break;
898 876
899 case ST_GET_PASSWORD: 877 case ST_GET_PASSWORD:
900 case ST_CONFIRM_PASSWORD: 878 case ST_CONFIRM_PASSWORD:
901 receive_player_password (pl->ob, 13); 879 receive_player_password (pl->ob, 13);
902 break; 880 break;
903 881
904 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 882 case ST_GET_PARTY_PASSWORD: /* Get password for party */
905 receive_party_password (pl->ob, 13); 883 receive_party_password (pl->ob, 13);
906 break; 884 break;
907 885
908 default: 886 default:
909 LOG (llevError, "Unknown input state: %d\n", pl->state); 887 LOG (llevError, "Unknown input state: %d\n", pl->state);
910 } 888 }
911} 889}
912 890
913/** 891/**
914 * Client tells its version. If there is a mismatch, we close the 892 * Client tells its version. If there is a mismatch, we close the
… …
916 * something older than the server. If we assume the client will be 894 * something older than the server. If we assume the client will be
917 * backwards compatible, having it be a later version should not be a 895 * backwards compatible, having it be a later version should not be a
918 * problem. 896 * problem.
919 */ 897 */
920void 898void
921VersionCmd (char *buf, int len, NewSocket * ns) 899VersionCmd (char *buf, int len, client * ns)
922{ 900{
923 char *cp;
924 char version_warning[256];
925
926 if (!buf) 901 if (!buf)
927 { 902 {
928 LOG (llevError, "CS: received corrupted version command\n"); 903 LOG (llevError, "CS: received corrupted version command\n");
929 return; 904 return;
930 } 905 }
931 906
932 ns->cs_version = atoi (buf); 907 ns->cs_version = atoi (buf);
933 ns->sc_version = ns->cs_version; 908 ns->sc_version = ns->cs_version;
909
910 LOG (llevDebug, "connection from client <%s>\n", buf);
911
912
913 //TODO: should log here just for statistics
914
934 if (VERSION_CS != ns->cs_version) 915 //if (VERSION_CS != ns->cs_version)
935 { 916 // unchecked;
936#ifdef ESRV_DEBUG 917
937 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
938#endif
939 }
940 cp = strchr (buf + 1, ' '); 918 char *cp = strchr (buf + 1, ' ');
941 if (!cp) 919 if (!cp)
942 return; 920 return;
921
943 ns->sc_version = atoi (cp); 922 ns->sc_version = atoi (cp);
923
944 if (VERSION_SC != ns->sc_version) 924 //if (VERSION_SC != ns->sc_version)
945 { 925 // unchecked;
946#ifdef ESRV_DEBUG 926
947 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
948#endif
949 }
950 cp = strchr (cp + 1, ' '); 927 cp = strchr (cp + 1, ' ');
928
951 if (cp) 929 if (cp)
952 { 930 {
953 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 931 assign (ns->version, cp + 1);
954 932
955 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
956
957 /* This is first implementation - i skip all beta DX clients with it
958 * Add later stuff here for other clients
959 */
960
961 /* these are old dxclients */
962 /* Version 1024 added support for singular + plural name values -
963 * requiing this minimal value reduces complexity of that code, and it
964 * has been around for a long time.
965 */
966 if (ns->sc_version < 1026) 933 if (ns->sc_version < 1026)
967 { 934 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
968 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
969 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 935 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
970 Write_String_To_Socket (ns, version_warning, strlen (version_warning));
971 }
972
973 } 936 }
974} 937}
975 938
976/** sound related functions. */ 939/** sound related functions. */
977
978void 940void
979SetSound (char *buf, int len, NewSocket * ns) 941SetSound (char *buf, int len, client * ns)
980{ 942{
981 ns->sound = atoi (buf); 943 ns->sound = atoi (buf);
982} 944}
983 945
984/** client wants the map resent */ 946/** client wants the map resent */
985 947
986void 948void
987MapRedrawCmd (char *buf, int len, player *pl) 949MapRedrawCmd (char *buf, int len, player *pl)
988{ 950{
989
990/* This function is currently disabled; just clearing the map state results in 951/* This function is currently disabled; just clearing the map state results in
991 * display errors. It should clear the cache and send a newmap command. 952 * display errors. It should clear the cache and send a newmap command.
992 * Unfortunately this solution does not work because some client versions send 953 * Unfortunately this solution does not work because some client versions send
993 * a mapredraw command after receiving a newmap command. 954 * a mapredraw command after receiving a newmap command.
994 */ 955 */
995#if 0
996 /* Okay, this is MAJOR UGLY. but the only way I know how to
997 * clear the "cache"
998 */
999 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1000 draw_client_map (pl->ob);
1001#endif
1002} 956}
1003 957
1004/** 958/**
1005 * Moves an object (typically, container to inventory). 959 * Moves an object (typically, container to inventory).
1006 * syntax is: move (to) (tag) (nrof) 960 * syntax is: move (to) (tag) (nrof)
… …
1009MoveCmd (char *buf, int len, player *pl) 963MoveCmd (char *buf, int len, player *pl)
1010{ 964{
1011 int vals[3], i; 965 int vals[3], i;
1012 966
1013 /* A little funky here. We only cycle for 2 records, because 967 /* A little funky here. We only cycle for 2 records, because
1014 * we obviously am not going to find a space after the third 968 * we obviously are not going to find a space after the third
1015 * record. Perhaps we should just replace this with a 969 * record. Perhaps we should just replace this with a
1016 * sscanf? 970 * sscanf?
1017 */ 971 */
1018 for (i = 0; i < 2; i++) 972 for (i = 0; i < 2; i++)
1019 { 973 {
1020 vals[i] = atoi (buf); 974 vals[i] = atoi (buf);
975
1021 if (!(buf = strchr (buf, ' '))) 976 if (!(buf = strchr (buf, ' ')))
1022 { 977 {
1023 LOG (llevError, "Incomplete move command: %s\n", buf); 978 LOG (llevError, "Incomplete move command: %s\n", buf);
1024 return; 979 return;
1025 } 980 }
981
1026 buf++; 982 buf++;
1027 } 983 }
984
1028 vals[2] = atoi (buf); 985 vals[2] = atoi (buf);
1029 986
1030/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 987/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1031 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 988 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1032} 989}
1033
1034
1035 990
1036/****************************************************************************** 991/******************************************************************************
1037 * 992 *
1038 * Start of commands the server sends to the client. 993 * Start of commands the server sends to the client.
1039 * 994 *
… …
1042/** 997/**
1043 * Asks the client to query the user. This way, the client knows 998 * Asks the client to query the user. This way, the client knows
1044 * it needs to send something back (vs just printing out a message) 999 * it needs to send something back (vs just printing out a message)
1045 */ 1000 */
1046void 1001void
1047send_query (NewSocket * ns, uint8 flags, char *text) 1002send_query (client *ns, uint8 flags, char *text)
1048{ 1003{
1049 char buf[MAX_BUF];
1050
1051 sprintf (buf, "query %d %s", flags, text ? text : ""); 1004 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1052 Write_String_To_Socket (ns, buf, strlen (buf));
1053} 1005}
1054 1006
1055#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1007#define AddIfInt64(Old,New,Type) if (Old != New) {\
1056 Old = New; \ 1008 Old = New; \
1057 sl << uint8 (Type) << uint64 (New); \ 1009 sl << uint8 (Type) << uint64 (New); \
… …
1087esrv_update_stats (player *pl) 1039esrv_update_stats (player *pl)
1088{ 1040{
1089 char buf[MAX_BUF]; 1041 char buf[MAX_BUF];
1090 uint16 flags; 1042 uint16 flags;
1091 1043
1092 SockList sl (MAXSOCKBUF); 1044 packet sl ("stats");
1093 sl << "stats ";
1094 1045
1095 if (pl->ob != NULL) 1046 if (pl->ob)
1096 { 1047 {
1097 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1048 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1098 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1049 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1099 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1050 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1100 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1051 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
… …
1107 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1058 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1108 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1059 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1109 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1060 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1110 } 1061 }
1111 1062
1112 if (pl->socket.exp64) 1063 if (pl->socket->exp64)
1113 {
1114 uint8 s;
1115
1116 for (s = 0; s < NUM_SKILLS; s++) 1064 for (int s = 0; s < NUM_SKILLS; s++)
1117 {
1118 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1065 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1119 { 1066 {
1120 /* Always send along the level if exp changes. This is only 1067 /* Always send along the level if exp changes. This is only
1121 * 1 extra byte, but keeps processing simpler. 1068 * 1 extra byte, but keeps processing simpler.
1122 */ 1069 */
1123 sl << uint8 (s + CS_STAT_SKILLINFO) 1070 sl << uint8 (s + CS_STAT_SKILLINFO)
1124 << uint8 (pl->last_skill_ob[s]->level) 1071 << uint8 (pl->last_skill_ob[s]->level)
1125 << uint64 (pl->last_skill_ob[s]->stats.exp); 1072 << uint64 (pl->last_skill_ob[s]->stats.exp);
1126 1073
1127 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1074 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1128 } 1075 }
1129 }
1130 }
1131 1076
1132 if (pl->socket.exp64) 1077 if (pl->socket->exp64)
1133 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1078 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1134 else 1079 else
1135 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1080 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1136 1081
1137 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1082 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1150 if (pl->run_on) 1095 if (pl->run_on)
1151 flags |= SF_RUNON; 1096 flags |= SF_RUNON;
1152 1097
1153 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1098 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1154 1099
1155 if (pl->socket.sc_version < 1025) 1100 if (pl->socket->sc_version < 1025)
1156 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1101 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1157 else 1102 else
1158 {
1159 int i;
1160
1161 for (i = 0; i < NROFATTACKS; i++) 1103 for (int i = 0; i < NROFATTACKS; i++)
1162 { 1104 {
1163 /* Skip ones we won't send */ 1105 /* Skip ones we won't send */
1164 if (atnr_cs_stat[i] == -1) 1106 if (atnr_cs_stat[i] == -1)
1165 continue; 1107 continue;
1166 1108
1167 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1109 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1168 } 1110 }
1169 }
1170 1111
1171 if (pl->socket.monitor_spells) 1112 if (pl->socket->monitor_spells)
1172 { 1113 {
1173 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1114 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1174 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1115 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1175 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1116 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1176 } 1117 }
1177 1118
1178 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1119 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1179 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1120 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1180 set_title (pl->ob, buf); 1121 set_title (pl->ob, buf);
1181 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1122 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1182 1123
1183 /* Only send it away if we have some actual data */ 1124 /* Only send it away if we have some actual data */
1184 if (sl.len > 6) 1125 if (sl.length () > 6)
1185 { 1126 pl->socket->send_packet (sl);
1186#ifdef ESRV_DEBUG
1187 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1188#endif
1189 Send_With_Handling (&pl->socket, &sl);
1190 }
1191
1192 sl.free ();
1193} 1127}
1194 1128
1195/** 1129/**
1196 * Tells the client that here is a player it should start using. 1130 * Tells the client that here is a player it should start using.
1197 */ 1131 */
1198void 1132void
1199esrv_new_player (player *pl, uint32 weight) 1133esrv_new_player (player *pl, uint32 weight)
1200{ 1134{
1201 pl->last_weight = weight; 1135 pl->last_weight = weight;
1202 1136
1203 SockList sl (MAXSOCKBUF); 1137 packet sl ("player");
1204 sl << "player ";
1205 1138
1206 sl << uint32 (pl->ob->count) 1139 sl << uint32 (pl->ob->count)
1207 << uint32 (weight) 1140 << uint32 (weight)
1208 << uint32 (pl->ob->face->number) 1141 << uint32 (pl->ob->face->number)
1209 << data8 (pl->ob->name); 1142 << data8 (pl->ob->name);
1210 1143
1211 Send_With_Handling (&pl->socket, &sl); 1144 pl->socket->send_packet (sl);
1212 sl.free ();
1213 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1145 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1214} 1146}
1215 1147
1216/** 1148/**
1217 * Need to send an animation sequence to the client. 1149 * Need to send an animation sequence to the client.
… …
1219 * sent them the face yet (this can become quite costly in terms of 1151 * sent them the face yet (this can become quite costly in terms of
1220 * how much we are sending - on the other hand, this should only happen 1152 * how much we are sending - on the other hand, this should only happen
1221 * when the player logs in and picks stuff up. 1153 * when the player logs in and picks stuff up.
1222 */ 1154 */
1223void 1155void
1224esrv_send_animation (NewSocket * ns, short anim_num) 1156esrv_send_animation (client * ns, short anim_num)
1225{ 1157{
1226 int i;
1227
1228 /* Do some checking on the anim_num we got. Note that the animations 1158 /* Do some checking on the anim_num we got. Note that the animations
1229 * are added in contigous order, so if the number is in the valid 1159 * are added in contigous order, so if the number is in the valid
1230 * range, it must be a valid animation. 1160 * range, it must be a valid animation.
1231 */ 1161 */
1232 if (anim_num < 0 || anim_num > num_animations) 1162 if (anim_num < 0 || anim_num > num_animations)
1233 { 1163 {
1234 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1164 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1235 return; 1165 return;
1236 } 1166 }
1237 1167
1238 SockList sl (MAXSOCKBUF); 1168 packet sl ("anim");
1239 1169
1240 sl << "anim "
1241 << uint16 (anim_num) 1170 sl << uint16 (anim_num)
1242 << uint16 (0); /* flags - not used right now */ 1171 << uint16 (0); /* flags - not used right now */
1243 1172
1244 /* Build up the list of faces. Also, send any information (ie, the 1173 /* Build up the list of faces. Also, send any information (ie, the
1245 * the face itself) down to the client. 1174 * the face itself) down to the client.
1246 */ 1175 */
1247 for (i = 0; i < animations[anim_num].num_animations; i++) 1176 for (int i = 0; i < animations[anim_num].num_animations; i++)
1248 { 1177 {
1249 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1178 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1250 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1179 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1180
1251 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1181 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1252 } 1182 }
1253 1183
1254 Send_With_Handling (ns, &sl); 1184 ns->send_packet (sl);
1255 sl.free ();
1256 1185
1257 ns->anims_sent[anim_num] = 1; 1186 ns->anims_sent[anim_num] = 1;
1258} 1187}
1259 1188
1260 1189
… …
1267/** 1196/**
1268 * This adds face_num to a map cell at x,y. If the client doesn't have 1197 * This adds face_num to a map cell at x,y. If the client doesn't have
1269 * the face yet, we will also send it. 1198 * the face yet, we will also send it.
1270 */ 1199 */
1271static void 1200static void
1272esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1201esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1273{ 1202{
1274 if (newmap->cells[x][y].count >= MAP_LAYERS) 1203 if (newmap->cells[x][y].count >= MAP_LAYERS)
1275 { 1204 {
1205 //TODO: one or the other, can't both have abort and return, verify and act
1276 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1206 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1277 return; 1207 return;
1278 abort (); 1208 abort ();
1279 } 1209 }
1280 1210
… …
1282 newmap->cells[x][y].count++; 1212 newmap->cells[x][y].count++;
1283 1213
1284 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1214 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1285 esrv_send_face (ns, face_num, 0); 1215 esrv_send_face (ns, face_num, 0);
1286} 1216}
1287
1288struct LayerCell
1289{
1290 uint16 xy;
1291 short face;
1292};
1293
1294struct MapLayer
1295{
1296 int count;
1297 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1298};
1299
1300/** Checkes if map cells have changed */
1301static int
1302mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1303{
1304 int k;
1305
1306 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1307 return 1;
1308 for (k = 0; k < newmap->cells[i][j].count; k++)
1309 {
1310 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1311 {
1312 return 1;
1313 }
1314 }
1315 return 0;
1316}
1317
1318/**
1319 * Basically, what this does is pack the data into layers.
1320 * cnum is the client number, cur is the the buffer we put all of
1321 * this data into. we return the end of the data. layers is
1322 * how many layers of data we should back.
1323 */
1324static uint8 *
1325compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1326{
1327 int x, y, k;
1328 int face;
1329 unsigned char *fcur;
1330 struct MapLayer layers[MAP_LAYERS];
1331
1332 for (k = 0; k < MAP_LAYERS; k++)
1333 layers[k].count = 0;
1334 fcur = cur;
1335 for (x = 0; x < ns->mapx; x++)
1336 {
1337 for (y = 0; y < ns->mapy; y++)
1338 {
1339 if (!mapcellchanged (ns, x, y, newmap))
1340 continue;
1341 if (newmap->cells[x][y].count == 0)
1342 {
1343 *cur = x * ns->mapy + y; /* mark empty space */
1344 cur++;
1345 continue;
1346 }
1347 for (k = 0; k < newmap->cells[x][y].count; k++)
1348 {
1349 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1350 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1351 layers[k].count++;
1352 }
1353 }
1354 }
1355 /* If no data, return now. */
1356 if (fcur == cur && layers[0].count == 0)
1357 return cur;
1358 *cur = 255; /* mark end of explicitly cleared cells */
1359 cur++;
1360 /* First pack by layers. */
1361 for (k = 0; k < numlayers; k++)
1362 {
1363 if (layers[k].count == 0)
1364 break; /* once a layer is entirely empty, no layer below it can
1365 have anything in it either */
1366 /* Pack by entries in thie layer */
1367 for (x = 0; x < layers[k].count;)
1368 {
1369 fcur = cur;
1370 *cur = layers[k].lcells[x].face >> 8;
1371 cur++;
1372 *cur = layers[k].lcells[x].face & 0xFF;
1373 cur++;
1374 face = layers[k].lcells[x].face;
1375 /* Now, we back the redundant data into 1 byte xy pairings */
1376 for (y = x; y < layers[k].count; y++)
1377 {
1378 if (layers[k].lcells[y].face == face)
1379 {
1380 *cur = (uint8) layers[k].lcells[y].xy;
1381 cur++;
1382 layers[k].lcells[y].face = -1;
1383 }
1384 }
1385 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1386 /* forward over the now redundant data */
1387 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1388 x++;
1389 }
1390 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1391 }
1392 return cur;
1393}
1394
1395static void
1396esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1397{
1398 static long frames, bytes, tbytes, tframes;
1399 char *cur;
1400
1401 SockList sl (MAXSOCKBUF);
1402 sl << "map ";
1403
1404 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1405 sl.len = cur - (char *) sl.buf;
1406
1407/* LOG(llevDebug, "Sending map command.\n");*/
1408
1409 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1410 {
1411 /* All of this is just accounting stuff */
1412 if (tframes > 100)
1413 tframes = tbytes = 0;
1414
1415 tframes++;
1416 frames++;
1417 tbytes += sl.len;
1418 bytes += sl.len;
1419 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1420 Send_With_Handling (ns, &sl);
1421 ns->sent_scroll = 0;
1422 }
1423
1424 sl.free ();
1425}
1426
1427 1217
1428/** Clears a map cell */ 1218/** Clears a map cell */
1429static void 1219static void
1430map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1220map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1431{ 1221{
… …
1442#define MAX_LAYERS 3 1232#define MAX_LAYERS 3
1443 1233
1444/* Using a global really isn't a good approach, but saves the over head of 1234/* Using a global really isn't a good approach, but saves the over head of
1445 * allocating and deallocating such a block of data each time run through, 1235 * allocating and deallocating such a block of data each time run through,
1446 * and saves the space of allocating this in the socket object when we only 1236 * and saves the space of allocating this in the socket object when we only
1447 * need it for this cycle. If the serve is ever threaded, this needs to be 1237 * need it for this cycle. If the server is ever threaded, this needs to be
1448 * re-examined. 1238 * re-examined.
1449 */ 1239 */
1450
1451static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1240static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1452 1241
1453/** 1242/**
1454 * Returns true if any of the heads for this 1243 * Returns true if any of the heads for this
1455 * space is set. Returns false if all are blank - this is used 1244 * space is set. Returns false if all are blank - this is used
1456 * for empty space checking. 1245 * for empty space checking.
1457 */ 1246 */
1458static inline int 1247static inline int
1459have_head (int ax, int ay) 1248have_head (int ax, int ay)
1460{ 1249{
1461
1462 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1250 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1463 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1251 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1464 return 1; 1252 return 1;
1253
1465 return 0; 1254 return 0;
1466} 1255}
1467 1256
1468/** 1257/**
1469 * check_head is a bit simplistic version of update_space below. 1258 * check_head is a bit simplistic version of update_space below.
1470 * basically, it only checks the that the head on space ax,ay at layer 1259 * basically, it only checks the that the head on space ax,ay at layer
1471 * needs to get sent - if so, it adds the data, sending the head 1260 * needs to get sent - if so, it adds the data, sending the head
1472 * if needed, and returning 1. If this no data needs to get 1261 * if needed, and returning 1. If this no data needs to get
1473 * sent, it returns zero. 1262 * sent, it returns zero.
1474 */ 1263 */
1475static int 1264static int
1476check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1265check_head (packet &sl, client &ns, int ax, int ay, int layer)
1477{ 1266{
1478 short face_num; 1267 short face_num;
1479 1268
1480 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1269 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1481 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1270 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1482 else 1271 else
1483 face_num = 0; 1272 face_num = 0;
1484 1273
1485 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1274 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1486 { 1275 {
1487 SockList_AddShort (&sl, face_num); 1276 sl << uint16 (face_num);
1488 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1277 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1489 esrv_send_face (&ns, face_num, 0); 1278 esrv_send_face (&ns, face_num, 0);
1490 1279
1491 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1280 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1492 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1281 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
… …
1513 * numbers the spaces differently - I think this was a leftover from 1302 * numbers the spaces differently - I think this was a leftover from
1514 * the map command, where the faces stack up. Sinces that is no longer 1303 * the map command, where the faces stack up. Sinces that is no longer
1515 * the case, it seems to make more sense to have these layer values 1304 * the case, it seems to make more sense to have these layer values
1516 * actually match. 1305 * actually match.
1517 */ 1306 */
1518
1519static int 1307static int
1520update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1308update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1521{ 1309{
1522 object *ob, *head; 1310 object *ob, *head;
1523 uint16 face_num; 1311 uint16 face_num;
1524 int bx, by, i; 1312 int bx, by, i;
1525 1313
… …
1738 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1526 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1739 * take. 1527 * take.
1740 */ 1528 */
1741 1529
1742static inline int 1530static inline int
1743update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1531update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1744{ 1532{
1745 object *ob; 1533 object *ob;
1746 int smoothlevel; /* old face_num; */ 1534 int smoothlevel; /* old face_num; */
1747 1535
1748 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1536 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1782 * Returns the size of a data for a map square as returned by 1570 * Returns the size of a data for a map square as returned by
1783 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1571 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1784 * available. 1572 * available.
1785 */ 1573 */
1786int 1574int
1787getExtendedMapInfoSize (NewSocket * ns) 1575getExtendedMapInfoSize (client * ns)
1788{ 1576{
1789 int result = 0; 1577 int result = 0;
1790 1578
1791 if (ns->ext_mapinfos) 1579 if (ns->ext_mapinfos)
1792 { 1580 {
1793 if (ns->EMI_smooth) 1581 if (ns->EMI_smooth)
1794 result += 1; /*One byte for smoothlevel */ 1582 result += 1; /*One byte for smoothlevel */
1795 } 1583 }
1584
1796 return result; 1585 return result;
1797} 1586}
1798 1587
1799/** 1588/**
1800 * This function uses the new map1 protocol command to send the map 1589 * This function uses the new map1 protocol command to send the map
… …
1828 uint8 eentrysize; 1617 uint8 eentrysize;
1829 uint16 ewhatstart, ewhatflag; 1618 uint16 ewhatstart, ewhatflag;
1830 uint8 extendedinfos; 1619 uint8 extendedinfos;
1831 maptile *m; 1620 maptile *m;
1832 1621
1833 NewSocket &socket = pl->contr->socket; 1622 client &socket = *pl->contr->socket;
1834 1623
1835 check_map_change (pl->contr); 1624 check_map_change (pl->contr);
1836 1625
1837 SockList sl (MAXSOCKBUF);
1838 SockList esl (MAXSOCKBUF);
1839
1840 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1626 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1627 packet esl;
1628
1841 startlen = sl.len; 1629 startlen = sl.length ();
1842 1630
1843 /*Extendedmapinfo structure initialisation */ 1631 /*Extendedmapinfo structure initialisation */
1844 if (socket.ext_mapinfos) 1632 if (socket.ext_mapinfos)
1845 { 1633 {
1846 extendedinfos = EMI_NOREDRAW; 1634 extendedinfos = EMI_NOREDRAW;
1847 1635
1848 if (socket.EMI_smooth) 1636 if (socket.EMI_smooth)
1849 extendedinfos |= EMI_SMOOTH; 1637 extendedinfos |= EMI_SMOOTH;
1850 1638
1851 ewhatstart = esl.len; 1639 ewhatstart = esl.length ();
1852 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1640 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1853 could need to be taken away */ 1641 could need to be taken away */
1854 eentrysize = getExtendedMapInfoSize (&socket); 1642 eentrysize = getExtendedMapInfoSize (&socket);
1855 esl << "mapextended " 1643 esl << "mapextended "
1856 << uint8 (extendedinfos) 1644 << uint8 (extendedinfos)
1857 << uint8 (eentrysize); 1645 << uint8 (eentrysize);
1646
1858 estartlen = esl.len; 1647 estartlen = esl.length ();
1859 } 1648 }
1860 else 1649 else
1861 { 1650 {
1862 /* suppress compiler warnings */ 1651 /* suppress compiler warnings */
1863 ewhatstart = 0; 1652 ewhatstart = 0;
… …
1888 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1677 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1889 { 1678 {
1890 ax = 0; 1679 ax = 0;
1891 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1680 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1892 { 1681 {
1893
1894 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1682 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1895 1683
1896 /* If this space is out of the normal viewable area, we only check 1684 /* If this space is out of the normal viewable area, we only check
1897 * the heads value ax or ay will only be greater than what 1685 * the heads value ax or ay will only be greater than what
1898 * the client wants if using the map1a command - this is because 1686 * the client wants if using the map1a command - this is because
… …
1901 */ 1689 */
1902 if (ax >= socket.mapx || ay >= socket.mapy) 1690 if (ax >= socket.mapx || ay >= socket.mapy)
1903 { 1691 {
1904 int i, got_one; 1692 int i, got_one;
1905 1693
1906 oldlen = sl.len; 1694 oldlen = sl.length ();
1907 1695
1908 sl << uint16 (mask); 1696 sl << uint16 (mask);
1909 1697
1910 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1698 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1911 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1699 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1915 * actually need to send that - just the coordinates 1703 * actually need to send that - just the coordinates
1916 * with no faces tells the client to blank out the 1704 * with no faces tells the client to blank out the
1917 * space. 1705 * space.
1918 */ 1706 */
1919 got_one = 0; 1707 got_one = 0;
1920 for (i = oldlen + 2; i < sl.len; i++) 1708 for (i = oldlen + 2; i < sl.length (); i++)
1921 if (sl.buf[i]) 1709 if (sl[i])
1922 got_one = 1; 1710 got_one = 1;
1923 1711
1924 if (got_one && (mask & 0xf)) 1712 if (got_one && (mask & 0xf))
1925 sl.buf[oldlen + 1] = mask & 0xff; 1713 sl[oldlen + 1] = mask & 0xff;
1926 else 1714 else
1927 { /*either all faces blank, either no face at all */ 1715 { /*either all faces blank, either no face at all */
1928 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1716 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1929 sl.len = oldlen + 2; 1717 sl.reset (oldlen + 2);
1930 else 1718 else
1931 sl.len = oldlen; 1719 sl.reset (oldlen);
1932 } 1720 }
1933 1721
1934 /*What concerns extendinfos, nothing to be done for now 1722 /*What concerns extendinfos, nothing to be done for now
1935 * (perhaps effects layer later) 1723 * (perhaps effects layer later)
1936 */ 1724 */
… …
1966 1754
1967 /* This block deals with spaces that are not visible for whatever 1755 /* This block deals with spaces that are not visible for whatever
1968 * reason. Still may need to send the head for this space. 1756 * reason. Still may need to send the head for this space.
1969 */ 1757 */
1970 1758
1971 oldlen = sl.len; 1759 oldlen = sl.length ();
1972 1760
1973 sl << uint16 (mask); 1761 sl << uint16 (mask);
1974 1762
1975 if (lastcell.count != -1) 1763 if (lastcell.count != -1)
1976 need_send = 1; 1764 need_send = 1;
… …
1996 1784
1997 map_clearcell (&lastcell, 0, 0, 0, count); 1785 map_clearcell (&lastcell, 0, 0, 0, count);
1998 } 1786 }
1999 1787
2000 if ((mask & 0xf) || need_send) 1788 if ((mask & 0xf) || need_send)
2001 sl.buf[oldlen + 1] = mask & 0xff; 1789 sl[oldlen + 1] = mask & 0xff;
2002 else 1790 else
2003 sl.len = oldlen; 1791 sl.reset (oldlen);
2004 } 1792 }
2005 else 1793 else
2006 { 1794 {
2007 /* In this block, the space is visible or there are head objects 1795 /* In this block, the space is visible or there are head objects
2008 * we need to send. 1796 * we need to send.
… …
2010 1798
2011 /* Rather than try to figure out what everything that we might 1799 /* Rather than try to figure out what everything that we might
2012 * need to send is, then form the packet after that, 1800 * need to send is, then form the packet after that,
2013 * we presume that we will in fact form a packet, and update 1801 * we presume that we will in fact form a packet, and update
2014 * the bits by what we do actually send. If we send nothing, 1802 * the bits by what we do actually send. If we send nothing,
2015 * we just back out sl.len to the old value, and no harm 1803 * we just back out sl.length () to the old value, and no harm
2016 * is done. 1804 * is done.
2017 * I think this is simpler than doing a bunch of checks to see 1805 * I think this is simpler than doing a bunch of checks to see
2018 * what if anything we need to send, setting the bits, then 1806 * what if anything we need to send, setting the bits, then
2019 * doing those checks again to add the real data. 1807 * doing those checks again to add the real data.
2020 */ 1808 */
2021 oldlen = sl.len; 1809 oldlen = sl.length ();
2022 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1810 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2023 eoldlen = esl.len; 1811 eoldlen = esl.length ();
2024 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1812 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2025 sl << uint16 (mask); 1813 sl << uint16 (mask);
2026 1814
2027 if (socket.ext_mapinfos) 1815 if (socket.ext_mapinfos)
2028 esl << uint16 (emask); 1816 esl << uint16 (emask);
… …
2036 mask |= 0x8; 1824 mask |= 0x8;
2037 1825
2038 if (socket.extmap) 1826 if (socket.extmap)
2039 { 1827 {
2040 *last_ext |= 0x80; 1828 *last_ext |= 0x80;
2041 last_ext = sl.buf + sl.len; 1829 last_ext = &sl[sl.length ()];
2042 sl << uint8 (d); 1830 sl << uint8 (d);
2043 } 1831 }
2044 else 1832 else
2045 sl << uint8 (255 - 64 * d); 1833 sl << uint8 (255 - 64 * d);
2046 } 1834 }
… …
2080 { 1868 {
2081 lastcell.stat_hp = stat_hp; 1869 lastcell.stat_hp = stat_hp;
2082 1870
2083 mask |= 0x8; 1871 mask |= 0x8;
2084 *last_ext |= 0x80; 1872 *last_ext |= 0x80;
2085 last_ext = sl.buf + sl.len; 1873 last_ext = &sl[sl.length ()];
2086 1874
2087 sl << uint8 (5) << uint8 (stat_hp); 1875 sl << uint8 (5) << uint8 (stat_hp);
2088 1876
2089 if (stat_width > 1) 1877 if (stat_width > 1)
2090 { 1878 {
2091 *last_ext |= 0x80; 1879 *last_ext |= 0x80;
2092 last_ext = sl.buf + sl.len; 1880 last_ext = &sl[sl.length ()];
2093 1881
2094 sl << uint8 (6) << uint8 (stat_width); 1882 sl << uint8 (6) << uint8 (stat_width);
2095 } 1883 }
2096 } 1884 }
2097 1885
… …
2099 { 1887 {
2100 lastcell.player = player; 1888 lastcell.player = player;
2101 1889
2102 mask |= 0x8; 1890 mask |= 0x8;
2103 *last_ext |= 0x80; 1891 *last_ext |= 0x80;
2104 last_ext = sl.buf + sl.len; 1892 last_ext = &sl[sl.length ()];
2105 1893
2106 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1894 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2107 } 1895 }
2108 1896
2109 if (lastcell.flags != flags) 1897 if (lastcell.flags != flags)
2110 { 1898 {
2111 lastcell.flags = flags; 1899 lastcell.flags = flags;
2112 1900
2113 mask |= 0x8; 1901 mask |= 0x8;
2114 *last_ext |= 0x80; 1902 *last_ext |= 0x80;
2115 last_ext = sl.buf + sl.len; 1903 last_ext = &sl[sl.length ()];
2116 1904
2117 sl << uint8 (8) << uint8 (flags); 1905 sl << uint8 (8) << uint8 (flags);
2118 } 1906 }
2119 } 1907 }
2120 1908
… …
2162 * space by checking the mask. If so, update the mask. 1950 * space by checking the mask. If so, update the mask.
2163 * if not, reset the len to that from before adding the mask 1951 * if not, reset the len to that from before adding the mask
2164 * value, so we don't send those bits. 1952 * value, so we don't send those bits.
2165 */ 1953 */
2166 if (mask & 0xf) 1954 if (mask & 0xf)
2167 sl.buf[oldlen + 1] = mask & 0xff; 1955 sl[oldlen + 1] = mask & 0xff;
2168 else 1956 else
2169 sl.len = oldlen; 1957 sl.reset (oldlen);
2170 1958
2171 if (emask & 0xf) 1959 if (emask & 0xf)
2172 esl.buf[eoldlen + 1] = emask & 0xff; 1960 esl[eoldlen + 1] = emask & 0xff;
2173 else 1961 else
2174 esl.len = eoldlen; 1962 esl.reset (eoldlen);
2175 } /* else this is a viewable space */ 1963 } /* else this is a viewable space */
2176 } /* for x loop */ 1964 } /* for x loop */
2177 } /* for y loop */ 1965 } /* for y loop */
2178 1966
2179 /* Verify that we in fact do need to send this */ 1967 /* Verify that we in fact do need to send this */
2180 if (socket.ext_mapinfos) 1968 if (socket.ext_mapinfos)
2181 { 1969 {
2182 if (!(sl.len > startlen || socket.sent_scroll)) 1970 if (!(sl.length () > startlen || socket.sent_scroll))
2183 { 1971 {
2184 /* No map data will follow, so don't say the client 1972 /* No map data will follow, so don't say the client
2185 * it doesn't need draw! 1973 * it doesn't need draw!
2186 */ 1974 */
2187 ewhatflag &= (~EMI_NOREDRAW); 1975 ewhatflag &= (~EMI_NOREDRAW);
2188 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1976 esl[ewhatstart + 1] = ewhatflag & 0xff;
2189 } 1977 }
2190 1978
2191 if (esl.len > estartlen) 1979 if (esl.length () > estartlen)
2192 Send_With_Handling (&socket, &esl); 1980 socket.send_packet (esl);
2193 } 1981 }
2194 1982
2195 if (sl.len > startlen || socket.sent_scroll) 1983 if (sl.length () > startlen || socket.sent_scroll)
2196 { 1984 {
2197 Send_With_Handling (&socket, &sl); 1985 socket.send_packet (sl);
2198 socket.sent_scroll = 0; 1986 socket.sent_scroll = 0;
2199 } 1987 }
2200
2201 sl.free ();
2202 esl.free ();
2203} 1988}
2204 1989
2205/** 1990/**
2206 * Draws client map. 1991 * Draws client map.
2207 */ 1992 */
… …
2231 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2016 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2232 return; 2017 return;
2233 2018
2234 memset (&newmap, 0, sizeof (struct Map)); 2019 memset (&newmap, 0, sizeof (struct Map));
2235 2020
2236 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2021 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2237 {
2238 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2022 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2239 { 2023 {
2240 ax = i; 2024 ax = i;
2241 ay = j; 2025 ay = j;
2242 m = pm; 2026 m = pm;
2243 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2027 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2028
2244 if (mflags & P_OUT_OF_MAP) 2029 if (mflags & P_OUT_OF_MAP)
2245 continue; 2030 continue;
2246 if (mflags & P_NEED_UPDATE) 2031
2247 update_position (m, ax, ay);
2248 /* If a map is visible to the player, we don't want to swap it out 2032 /* If a map is visible to the player, we don't want to swap it out
2249 * just to reload it. This should really call something like 2033 * just to reload it. This should really call something like
2250 * swap_map, but this is much more efficient and 'good enough' 2034 * swap_map, but this is much more efficient and 'good enough'
2251 */ 2035 */
2252 if (mflags & P_NEW_MAP) 2036 if (mflags & P_NEW_MAP)
2253 m->timeout = 50; 2037 m->timeout = 50;
2254 } 2038 }
2255 } 2039
2256 /* do LOS after calls to update_position */ 2040 /* do LOS after calls to update_position */
2257 if (pl->contr->do_los) 2041 if (pl->contr->do_los)
2258 { 2042 {
2259 update_los (pl); 2043 update_los (pl);
2260 pl->contr->do_los = 0; 2044 pl->contr->do_los = 0;
2261 } 2045 }
2262 2046
2263 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2264 {
2265 /* Big maps need a different drawing mechanism to work */ 2047 /* Big maps need a different drawing mechanism to work */
2266 draw_client_map1 (pl); 2048 draw_client_map1 (pl);
2267 return;
2268 }
2269
2270 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2271 {
2272 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2273 }
2274
2275 /* j and i are the y and x coordinates of the real map (which is
2276 * basically some number of spaces around the player)
2277 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2278 * left corner) and are thus disconnected from the map values.
2279 * Subtract 1 from the max values so that we properly handle cases where
2280 * player has specified an even map. Otherwise, we try to send them too
2281 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2282 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2283 * odd, this still works fine.
2284 */
2285 ay = 0;
2286 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2287 {
2288 ax = 0;
2289 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2290 {
2291
2292 d = pl->contr->blocked_los[ax][ay];
2293 /* note the out_of_map and d>3 checks are both within the same
2294 * negation check.
2295 */
2296 nx = i;
2297 ny = j;
2298 m = get_map_from_coord (pm, &nx, &ny);
2299 if (m && d < 4)
2300 {
2301 face = GET_MAP_FACE (m, nx, ny, 0);
2302 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2303 floor = GET_MAP_FACE (m, nx, ny, 2);
2304
2305 /* If all is blank, send a blank face. */
2306 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2307 {
2308 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2309 }
2310 else
2311 { /* actually have something interesting */
2312 /* send the darkness mask, if any. */
2313 if (d && pl->contr->socket.darkness)
2314 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2315
2316 if (face && face != blank_face)
2317 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2318 if (floor2 && floor2 != blank_face)
2319 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2320 if (floor && floor != blank_face)
2321 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2322 }
2323 } /* Is a valid space */
2324 }
2325 }
2326
2327 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2328
2329 check_map_change (pl->contr);
2330} 2049}
2331 2050
2332 2051
2333/*****************************************************************************/ 2052/*****************************************************************************/
2334 2053
… …
2340 2059
2341/*****************************************************************************/ 2060/*****************************************************************************/
2342void 2061void
2343send_plugin_custom_message (object *pl, char *buf) 2062send_plugin_custom_message (object *pl, char *buf)
2344{ 2063{
2345 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2064 pl->contr->socket->send_packet (buf);
2346} 2065}
2347 2066
2348/** 2067/**
2349 * This sends the skill number to name mapping. We ignore 2068 * This sends the skill number to name mapping. We ignore
2350 * the params - we always send the same info no matter what. 2069 * the params - we always send the same info no matter what.
2351 */ 2070 */
2352void 2071void
2353send_skill_info (NewSocket *ns, char *params) 2072send_skill_info (client *ns, char *params)
2354{ 2073{
2355 SockList sl (MAXSOCKBUF); 2074 packet sl;
2356 sl << "replyinfo skill_info\n"; 2075 sl << "replyinfo skill_info\n";
2357 2076
2358 for (int i = 1; i < NUM_SKILLS; i++) 2077 for (int i = 1; i < NUM_SKILLS; i++)
2359 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2078 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2360 2079
2361 if (sl.len >= MAXSOCKBUF) 2080 if (sl.length () >= MAXSOCKBUF)
2362 { 2081 {
2363 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2082 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2364 fatal (0); 2083 fatal (0);
2365 } 2084 }
2366 2085
2367 Send_With_Handling (ns, &sl); 2086 ns->send_packet (sl);
2368 sl.free ();
2369} 2087}
2370 2088
2371/** 2089/**
2372 * This sends the spell path to name mapping. We ignore 2090 * This sends the spell path to name mapping. We ignore
2373 * the params - we always send the same info no matter what. 2091 * the params - we always send the same info no matter what.
2374 */ 2092 */
2375void 2093void
2376send_spell_paths (NewSocket * ns, char *params) 2094send_spell_paths (client * ns, char *params)
2377{ 2095{
2378 SockList sl (MAXSOCKBUF); 2096 packet sl;
2379 2097
2380 sl << "replyinfo spell_paths\n"; 2098 sl << "replyinfo spell_paths\n";
2381 2099
2382 for (int i = 0; i < NRSPELLPATHS; i++) 2100 for (int i = 0; i < NRSPELLPATHS; i++)
2383 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2101 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2384 2102
2385 if (sl.len >= MAXSOCKBUF) 2103 if (sl.length () >= MAXSOCKBUF)
2386 { 2104 {
2387 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2105 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2388 fatal (0); 2106 fatal (0);
2389 } 2107 }
2390 2108
2391 Send_With_Handling (ns, &sl); 2109 ns->send_packet (sl);
2392 sl.free ();
2393} 2110}
2394 2111
2395/** 2112/**
2396 * This looks for any spells the player may have that have changed their stats. 2113 * This looks for any spells the player may have that have changed their stats.
2397 * it then sends an updspell packet for each spell that has changed in this way 2114 * it then sends an updspell packet for each spell that has changed in this way
2398 */ 2115 */
2399void 2116void
2400esrv_update_spells (player *pl) 2117esrv_update_spells (player *pl)
2401{ 2118{
2402 if (!pl->socket.monitor_spells) 2119 if (!pl->socket->monitor_spells)
2403 return; 2120 return;
2404 2121
2405 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2122 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2406 { 2123 {
2407 if (spell->type == SPELL) 2124 if (spell->type == SPELL)
… …
2427 flags |= UPD_SP_DAMAGE; 2144 flags |= UPD_SP_DAMAGE;
2428 } 2145 }
2429 2146
2430 if (flags) 2147 if (flags)
2431 { 2148 {
2432 SockList sl (MAXSOCKBUF); 2149 packet sl;
2433 2150
2434 sl << "updspell " 2151 sl << "updspell "
2435 << uint8 (flags) 2152 << uint8 (flags)
2436 << uint32 (spell->count); 2153 << uint32 (spell->count);
2437 2154
2438 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2155 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2439 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2156 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2440 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2157 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2441 2158
2442 Send_With_Handling (&pl->socket, &sl); 2159 pl->socket->send_packet (sl);
2443 sl.free ();
2444 } 2160 }
2445 } 2161 }
2446 } 2162 }
2447} 2163}
2448 2164
2449void 2165void
2450esrv_remove_spell (player *pl, object *spell) 2166esrv_remove_spell (player *pl, object *spell)
2451{ 2167{
2452 if (!pl->socket.monitor_spells) 2168 if (!pl->socket->monitor_spells)
2453 return; 2169 return;
2454 2170
2455 if (!pl || !spell || spell->env != pl->ob) 2171 if (!pl || !spell || spell->env != pl->ob)
2456 { 2172 {
2457 LOG (llevError, "Invalid call to esrv_remove_spell"); 2173 LOG (llevError, "Invalid call to esrv_remove_spell");
2458 return; 2174 return;
2459 } 2175 }
2460 2176
2461 SockList sl (MAXSOCKBUF); 2177 packet sl ("delspell");
2462 2178
2463 sl << "delspell "
2464 << uint32 (spell->count); 2179 sl << uint32 (spell->count);
2465 2180
2466 Send_With_Handling (&pl->socket, &sl); 2181 pl->socket->send_packet (sl);
2467 sl.free ();
2468} 2182}
2469 2183
2470/* appends the spell *spell to the Socklist we will send the data to. */ 2184/* appends the spell *spell to the Socklist we will send the data to. */
2471static void 2185static void
2472append_spell (player *pl, SockList &sl, object *spell) 2186append_spell (player *pl, packet &sl, object *spell)
2473{ 2187{
2474 int len, i, skill = 0; 2188 int len, i, skill = 0;
2475 2189
2476 if (!(spell->name)) 2190 if (!(spell->name))
2477 { 2191 {
… …
2520 { 2234 {
2521 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2235 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2522 return; 2236 return;
2523 } 2237 }
2524 2238
2525 if (!pl->socket.monitor_spells) 2239 if (!pl->socket->monitor_spells)
2526 return; 2240 return;
2527 2241
2528 SockList sl (MAXSOCKBUF); 2242 packet sl ("addspell");
2529
2530 sl << "addspell ";
2531 2243
2532 if (!spell) 2244 if (!spell)
2533 { 2245 {
2534 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2246 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2535 { 2247 {
… …
2547 * like it will fix this 2259 * like it will fix this
2548 */ 2260 */
2549 if (spell->type != SPELL) 2261 if (spell->type != SPELL)
2550 continue; 2262 continue;
2551 2263
2552 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2264 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2553 { 2265 {
2554 Send_With_Handling (&pl->socket, &sl); 2266 pl->socket->send_packet (sl);
2555 strcpy ((char *) sl.buf, "addspell "); 2267
2556 sl.len = strlen ((char *) sl.buf); 2268 sl.reset ();
2269 sl << "addspell ";
2557 } 2270 }
2558 2271
2559 append_spell (pl, sl, spell); 2272 append_spell (pl, sl, spell);
2560 } 2273 }
2561 } 2274 }
… …
2572 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2285 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2573 fatal (0); 2286 fatal (0);
2574 } 2287 }
2575 2288
2576 /* finally, we can send the packet */ 2289 /* finally, we can send the packet */
2577 Send_With_Handling (&pl->socket, &sl); 2290 pl->socket->send_packet (sl);
2578
2579 sl.free ();
2580} 2291}
2581 2292

Diff Legend

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