ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.27 by root, Wed Dec 13 18:08:02 2006 UTC vs.
Revision 1.50 by root, Thu Dec 21 23:37:06 2006 UTC

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

Diff Legend

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