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

Diff Legend

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