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.39 by root, Fri Dec 15 03:53:44 2006 UTC

… …
41 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
42 * 42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing 43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations 44 * operations
45 * 45 *
46 * esrv_map_doneredraw finishes the map update, and ships across the
47 * map updates.
48 *
49 */ 46 */
50 47
51#include <global.h> 48#include <global.h>
52#include <sproto.h> 49#include <sproto.h>
53 50
… …
57#include <commands.h> 54#include <commands.h>
58 55
59/* This block is basically taken from socket.c - I assume if it works there, 56/* This block is basically taken from socket.c - I assume if it works there,
60 * it should work here. 57 * it should work here.
61 */ 58 */
62#ifndef WIN32 /* ---win32 exclude unix headers */
63# include <sys/types.h> 59#include <sys/types.h>
64# include <sys/time.h> 60#include <sys/time.h>
65# include <sys/socket.h> 61#include <sys/socket.h>
66# include <netinet/in.h> 62#include <netinet/in.h>
67# include <netdb.h> 63#include <netdb.h>
68#endif /* win32 */
69 64
70#ifdef HAVE_UNISTD_H
71# include <unistd.h> 65#include <unistd.h>
72#endif
73
74#ifdef HAVE_SYS_TIME_H
75# include <sys/time.h> 66#include <sys/time.h>
76#endif
77 67
78#include "sounds.h" 68#include "sounds.h"
79 69
80/** 70/**
81 * This table translates the attack numbers as used within the 71 * This table translates the attack numbers as used within the
… …
98 -1, /* life stealing */ 88 -1, /* life stealing */
99 -1 /* Disease - not fully done yet */ 89 -1 /* Disease - not fully done yet */
100}; 90};
101 91
102static void 92static void
103socket_map_scroll (NewSocket * ns, int dx, int dy) 93socket_map_scroll (client_socket * ns, int dx, int dy)
104{ 94{
105 struct Map newmap; 95 struct Map newmap;
106 int x, y, mx, my; 96 int x, y, mx, my;
107 97
108 { 98 {
109 char buf[MAXSOCKBUF]; 99 packet sl;
110 100
111 sprintf (buf, "map_scroll %d %d", dx, dy); 101 sl.printf ("map_scroll %d %d", dx, dy);
112 Write_String_To_Socket (ns, buf, strlen (buf)); 102 ns->send_packet (sl);
113 } 103 }
114 104
115 /* If we are using the Map1aCmd, we may in fact send 105 /* If we are using the Map1aCmd, we may in fact send
116 * head information that is outside the viewable map. 106 * head information that is outside the viewable map.
117 * So set the mx,my to the max value we want to 107 * So set the mx,my to the max value we want to
… …
158} 148}
159 149
160static void 150static void
161clear_map (player *pl) 151clear_map (player *pl)
162{ 152{
163 NewSocket & socket = pl->socket; 153 client_socket &socket = *pl->socket;
164 154
165 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 155 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
166 156
167 if (socket.newmapcmd == 1) 157 if (socket.newmapcmd == 1)
168 Write_String_To_Socket (&socket, "newmap", 6); 158 socket.send_packet ("newmap");
169 159
170 socket.update_look = 1; 160 socket.update_look = 1;
171 socket.look_position = 0; 161 socket.look_position = 0;
172} 162}
173 163
174/** check for map change and send new map data */ 164/** check for map change and send new map data */
175static void 165static void
176check_map_change (player *pl) 166check_map_change (player *pl)
177{ 167{
178 NewSocket & socket = pl->socket; 168 client_socket &socket = *pl->socket;
179 object *ob = pl->ob; 169 object *ob = pl->ob;
180 char buf[MAX_BUF]; /* eauugggh */ 170 char buf[MAX_BUF]; /* eauugggh */
181 171
182 if (socket.current_map != ob->map) 172 if (socket.current_map != ob->map)
183 { 173 {
… …
204 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 194 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
205 } 195 }
206 else 196 else
207 snprintf (buf, MAX_BUF, "mapinfo current"); 197 snprintf (buf, MAX_BUF, "mapinfo current");
208 198
209 Write_String_To_Socket (&socket, buf, strlen (buf)); 199 socket.send_packet (buf);
210 } 200 }
211 } 201 }
212 else if (socket.current_x != ob->x || socket.current_y != ob->y) 202 else if (socket.current_x != ob->x || socket.current_y != ob->y)
213 { 203 {
214 int dx = ob->x - socket.current_x; 204 int dx = ob->x - socket.current_x;
… …
254 buf += 8; 244 buf += 8;
255 245
256 // initial map and its origin 246 // initial map and its origin
257 maptile *map = pl->ob->map; 247 maptile *map = pl->ob->map;
258 sint16 dx, dy; 248 sint16 dx, dy;
259 int mapx = pl->socket.mapx / 2 - pl->ob->x; 249 int mapx = pl->socket->mapx / 2 - pl->ob->x;
260 int mapy = pl->socket.mapy / 2 - pl->ob->y; 250 int mapy = pl->socket->mapy / 2 - pl->ob->y;
261 int max_distance = 8; // limit maximum path length to something generous 251 int max_distance = 8; // limit maximum path length to something generous
262 252
263 while (*buf && map && max_distance) 253 while (*buf && map && max_distance)
264 { 254 {
265 int dir = *buf++; 255 int dir = *buf++;
… …
316 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 306 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
317 } 307 }
318 else 308 else
319 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 309 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
320 310
321 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 311 pl->socket->send_packet (bigbuf);
322} 312}
323 313
324/** This is the Setup cmd - easy first implementation */ 314/** This is the Setup cmd - easy first implementation */
325void 315void
326SetUp (char *buf, int len, NewSocket * ns) 316SetUp (char *buf, int len, client_socket * ns)
327{ 317{
328 int s, slen; 318 int s, slen;
329 char *cmd, *param, cmdback[HUGE_BUF]; 319 char *cmd, *param, cmdback[HUGE_BUF];
330 320
331 /* run through the cmds of setup 321 /* run through the cmds of setup
… …
333 * 323 *
334 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 324 * 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 325 * The client then must sort this out
336 */ 326 */
337 327
338 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 328 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
329
339 strcpy (cmdback, "setup"); 330 strcpy (cmdback, "setup");
340 for (s = 0; s < len;) 331 for (s = 0; s < len; )
341 { 332 {
342
343 cmd = &buf[s]; 333 cmd = &buf[s];
344 334
345 /* find the next space, and put a null there */ 335 /* find the next space, and put a null there */
346 for (; buf[s] && buf[s] != ' '; s++); 336 for (; buf[s] && buf[s] != ' '; s++)
337 ;
338
347 buf[s++] = 0; 339 buf[s++] = 0;
340
348 while (buf[s] == ' ') 341 while (buf[s] == ' ')
349 s++; 342 s++;
350 343
351 if (s >= len) 344 if (s >= len)
352 break; 345 break;
353 346
354 param = &buf[s]; 347 param = &buf[s];
355 348
356 for (; buf[s] && buf[s] != ' '; s++); 349 for (; buf[s] && buf[s] != ' '; s++)
350 ;
351
357 buf[s++] = 0; 352 buf[s++] = 0;
353
358 while (buf[s] == ' ') 354 while (buf[s] == ' ')
359 s++; 355 s++;
360 356
361 slen = strlen (cmdback); 357 slen = strlen (cmdback);
362 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 358 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
523 * report a failure to the client. 519 * report a failure to the client.
524 */ 520 */
525 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 521 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
526 } 522 }
527 } /* for processing all the setup commands */ 523 } /* for processing all the setup commands */
524
528 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 525 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
529 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 526 ns->send_packet (cmdback);
530} 527}
531 528
532/** 529/**
533 * The client has requested to be added to the game. 530 * 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. 531 * 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, 532 * 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. 533 * it either has to be here or init_sockets needs to be exported.
537 */ 534 */
538void 535void
539AddMeCmd (char *buf, int len, NewSocket * ns) 536AddMeCmd (char *buf, int len, client_socket * ns)
540{ 537{
541 Settings oldsettings; 538 Settings oldsettings;
542 539
543 oldsettings = settings; 540 oldsettings = settings;
544 if (ns->status != Ns_Add || add_player (ns)) 541 if (ns->status != Ns_Add || add_player (ns))
545 { 542 ns->send_packet ("addme_failed");
546 Write_String_To_Socket (ns, "addme_failed", 12);
547 }
548 else 543 else
549 { 544 ns->send_packet ("addme_success");
550 /* Basically, the add_player copies the socket structure into 545
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; 546 settings = oldsettings;
560} 547}
561 548
562/** Reply to ExtendedInfos command */ 549/** Reply to ExtendedInfos command */
563void 550void
564ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 551ToggleExtendedInfos (char *buf, int len, client_socket * ns)
565{ 552{
566 char cmdback[MAX_BUF]; 553 char cmdback[MAX_BUF];
567 char command[50]; 554 char command[50];
568 int info, nextinfo; 555 int info, nextinfo;
569 556
… …
607 { 594 {
608 strcat (cmdback, " "); 595 strcat (cmdback, " ");
609 strcat (cmdback, "smoothing"); 596 strcat (cmdback, "smoothing");
610 } 597 }
611 598
612 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 599 ns->send_packet (cmdback);
613} 600}
614 601
615/* 602/*
616#define MSG_TYPE_BOOK 1 603#define MSG_TYPE_BOOK 1
617#define MSG_TYPE_CARD 2 604#define MSG_TYPE_CARD 2
… …
620#define MSG_TYPE_MONUMENT 5 607#define MSG_TYPE_MONUMENT 5
621#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 608#define MSG_TYPE_SCRIPTED_DIALOG 6*/
622 609
623/** Reply to ExtendedInfos command */ 610/** Reply to ExtendedInfos command */
624void 611void
625ToggleExtendedText (char *buf, int len, NewSocket * ns) 612ToggleExtendedText (char *buf, int len, client_socket * ns)
626{ 613{
627 char cmdback[MAX_BUF]; 614 char cmdback[MAX_BUF];
628 char temp[10]; 615 char temp[10];
629 char command[50]; 616 char command[50];
630 int info, nextinfo, i, flag; 617 int info, nextinfo, i, flag;
… …
670 strcat (cmdback, " "); 657 strcat (cmdback, " ");
671 snprintf (temp, sizeof (temp), "%d", i); 658 snprintf (temp, sizeof (temp), "%d", i);
672 strcat (cmdback, temp); 659 strcat (cmdback, temp);
673 } 660 }
674 661
675 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 662 ns->send_packet (cmdback);
676} 663}
677 664
678/** 665/**
679 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 666 * 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 667 * 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 668 * 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 669 * if we know the client wants it, might as well push it to the
683 * client. 670 * client.
684 */ 671 */
685static void 672static void
686SendSmooth (NewSocket * ns, uint16 face) 673SendSmooth (client_socket * ns, uint16 face)
687{ 674{
688 uint16 smoothface; 675 uint16 smoothface;
689 unsigned char reply[MAX_BUF];
690 SockList sl;
691 676
692 /* If we can't find a face, return and set it so we won't try to send this 677 /* If we can't find a face, return and set it so we won't try to send this
693 * again. 678 * again.
694 */ 679 */
695 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 680 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
703 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 688 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
704 esrv_send_face (ns, smoothface, 0); 689 esrv_send_face (ns, smoothface, 0);
705 690
706 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 691 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
707 692
708 sl.buf = reply; 693 packet sl;
709 strcpy ((char *) sl.buf, "smooth "); 694
710 sl.len = strlen ((char *) sl.buf); 695 sl << "smooth "
711 SockList_AddShort (&sl, face); 696 << uint16 (face)
712 SockList_AddShort (&sl, smoothface); 697 << uint16 (smoothface);
713 Send_With_Handling (ns, &sl); 698
699 ns->send_packet (sl);
714} 700}
715 701
716 /** 702 /**
717 * Tells client the picture it has to use 703 * Tells client the picture it has to use
718 * to smooth a picture number given as argument. 704 * to smooth a picture number given as argument.
719 */ 705 */
720void 706void
721AskSmooth (char *buf, int len, NewSocket * ns) 707AskSmooth (char *buf, int len, client_socket * ns)
722{ 708{
723 uint16 facenbr; 709 uint16 facenbr;
724 710
725 facenbr = atoi (buf); 711 facenbr = atoi (buf);
726 SendSmooth (ns, facenbr); 712 SendSmooth (ns, facenbr);
727} 713}
728
729
730
731
732 714
733/** 715/**
734 * This handles the general commands from the client (ie, north, fire, cast, 716 * This handles the general commands from the client (ie, north, fire, cast,
735 * etc.) 717 * etc.)
736 */ 718 */
… …
787 * etc.). It is a lot like PlayerCmd above, but is called with the 769 * 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 770 * 'ncom' method which gives more information back to the client so it
789 * can throttle. 771 * can throttle.
790 */ 772 */
791void 773void
792NewPlayerCmd (uint8 * buf, int len, player *pl) 774NewPlayerCmd (char *buf, int len, player *pl)
793{ 775{
794 int time, repeat; 776 int time, repeat;
795 short packet;
796 unsigned char command[MAX_BUF]; 777 char command[MAX_BUF];
797 SockList sl; 778 int pktlen;
798 779
799 if (len < 7) 780 if (len < 7)
800 { 781 {
801 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 782 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
802 return; 783 return;
803 } 784 }
804 785
805 packet = GetShort_String (buf); 786 pktlen = net_uint16 ((uint8 *)buf);
806 repeat = GetInt_String (buf + 2); 787 repeat = net_uint32 ((uint8 *)buf + 2);
788
807 /* -1 is special - no repeat, but don't update */ 789 /* -1 is special - no repeat, but don't update */
808 if (repeat != -1) 790 if (repeat != -1)
809 {
810 pl->count = repeat; 791 pl->count = repeat;
811 } 792
812 if ((len - 4) >= MAX_BUF) 793 if ((len - 4) >= MAX_BUF)
813 len = MAX_BUF - 5; 794 len = MAX_BUF - 5;
814 795
815 strncpy ((char *) command, (char *) buf + 6, len - 4); 796 strncpy ((char *) command, (char *) buf + 6, len - 4);
816 command[len - 4] = '\0'; 797 command[len - 4] = 0;
817
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 798
829 /* This should not happen anymore. */ 799 /* This should not happen anymore. */
830 if (pl->ob->speed_left < -1.0) 800 if (pl->ob->speed_left < -1.0)
831 {
832 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 801 LOG (llevError, "Player has negative time - shouldn't do command.\n");
833 } 802
834 /* In c_new.c */ 803 /* In c_new.c */
835 execute_newserver_command (pl->ob, (char *) command); 804 execute_newserver_command (pl->ob, (char *) command);
836 /* Perhaps something better should be done with a left over count. 805 /* Perhaps something better should be done with a left over count.
837 * Cleaning up the input should probably be done first - all actions 806 * 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 807 * for the command that issued the count should be done before any other
839 * commands. 808 * commands.
840 */ 809 */
841 pl->count = 0; 810 pl->count = 0;
842 811
843 /* Send confirmation of command execution now */
844 sl.buf = command;
845 strcpy ((char *) sl.buf, "comc ");
846 sl.len = 5;
847 SockList_AddShort (&sl, packet);
848 if (FABS (pl->ob->speed) < 0.001) 812 if (FABS (pl->ob->speed) < 0.001)
849 time = MAX_TIME * 100; 813 time = MAX_TIME * 100;
850 else 814 else
851 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 815 time = (int) (MAX_TIME / FABS (pl->ob->speed));
852 SockList_AddInt (&sl, time); 816
853 Send_With_Handling (&pl->socket, &sl); 817 /* Send confirmation of command execution now */
818
819 packet sl;
820 sl << "comc " << uint16 (pktlen) << uint32 (time);
821 pl->socket->send_packet (sl);
854} 822}
855 823
856 824
857/** This is a reply to a previous query. */ 825/** This is a reply to a previous query. */
858void 826void
… …
925 * something older than the server. If we assume the client will be 893 * 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 894 * backwards compatible, having it be a later version should not be a
927 * problem. 895 * problem.
928 */ 896 */
929void 897void
930VersionCmd (char *buf, int len, NewSocket * ns) 898VersionCmd (char *buf, int len, client_socket * ns)
931{ 899{
932 char *cp; 900 char *cp;
933 char version_warning[256]; 901 char version_warning[256];
934 902
935 if (!buf) 903 if (!buf)
… …
970 /* these are old dxclients */ 938 /* these are old dxclients */
971 /* Version 1024 added support for singular + plural name values - 939 /* Version 1024 added support for singular + plural name values -
972 * requiing this minimal value reduces complexity of that code, and it 940 * requiing this minimal value reduces complexity of that code, and it
973 * has been around for a long time. 941 * has been around for a long time.
974 */ 942 */
975 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) 943 if (ns->sc_version < 1026)
976 { 944 {
977 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 945 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
978 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 946 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
979 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 947 ns->send_packet (version_warning);
980 } 948 }
981 949
982 } 950 }
983} 951}
984 952
985/** sound related functions. */ 953/** sound related functions. */
986 954
987void 955void
988SetSound (char *buf, int len, NewSocket * ns) 956SetSound (char *buf, int len, client_socket * ns)
989{ 957{
990 ns->sound = atoi (buf); 958 ns->sound = atoi (buf);
991} 959}
992 960
993/** client wants the map resent */ 961/** client wants the map resent */
… …
1003 */ 971 */
1004#if 0 972#if 0
1005 /* Okay, this is MAJOR UGLY. but the only way I know how to 973 /* Okay, this is MAJOR UGLY. but the only way I know how to
1006 * clear the "cache" 974 * clear the "cache"
1007 */ 975 */
1008 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 976 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1009 draw_client_map (pl->ob); 977 draw_client_map (pl->ob);
1010#endif 978#endif
1011} 979}
1012 980
1013/** 981/**
… …
1051/** 1019/**
1052 * Asks the client to query the user. This way, the client knows 1020 * 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) 1021 * it needs to send something back (vs just printing out a message)
1054 */ 1022 */
1055void 1023void
1056send_query (NewSocket * ns, uint8 flags, char *text) 1024send_query (client_socket * ns, uint8 flags, char *text)
1057{ 1025{
1058 char buf[MAX_BUF]; 1026 char buf[MAX_BUF];
1059 1027
1060 sprintf (buf, "query %d %s", flags, text ? text : ""); 1028 sprintf (buf, "query %d %s", flags, text ? text : "");
1061 Write_String_To_Socket (ns, buf, strlen (buf)); 1029 ns->send_packet (buf);
1062} 1030}
1063 1031
1064#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1032#define AddIfInt64(Old,New,Type) if (Old != New) {\
1065 Old = New; \ 1033 Old = New; \
1066 SockList_AddChar(&sl, Type); \ 1034 sl << uint8 (Type) << uint64 (New); \
1067 SockList_AddInt64(&sl, New); \
1068 } 1035 }
1069 1036
1070#define AddIfInt(Old,New,Type) if (Old != New) {\ 1037#define AddIfInt(Old,New,Type) if (Old != New) {\
1071 Old = New; \ 1038 Old = New; \
1072 SockList_AddChar(&sl, Type); \ 1039 sl << uint8 (Type) << uint32 (New); \
1073 SockList_AddInt(&sl, New); \
1074 } 1040 }
1075 1041
1076#define AddIfShort(Old,New,Type) if (Old != New) {\ 1042#define AddIfShort(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 1043 Old = New; \
1078 SockList_AddChar(&sl, Type); \ 1044 sl << uint8 (Type) << uint16 (New); \
1079 SockList_AddShort(&sl, New); \
1080 } 1045 }
1081 1046
1082#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1047#define AddIfFloat(Old,New,Type) if (Old != New) {\
1083 Old = New; \ 1048 Old = New; \
1084 SockList_AddChar(&sl, Type); \ 1049 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1085 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1086 } 1050 }
1087 1051
1088#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1052#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1089 if (Old) free(Old);\
1090 Old = strdup_local(New);\ 1053 free(Old); Old = strdup (New);\
1091 SockList_AddChar(&sl, Type); \ 1054 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 } 1055 }
1096 1056
1097/** 1057/**
1098 * Sends a statistics update. We look at the old values, 1058 * Sends a statistics update. We look at the old values,
1099 * and only send what has changed. Stat mapping values are in newclient.h 1059 * and only send what has changed. Stat mapping values are in newclient.h
… …
1101 * commands for now. 1061 * commands for now.
1102 */ 1062 */
1103void 1063void
1104esrv_update_stats (player *pl) 1064esrv_update_stats (player *pl)
1105{ 1065{
1106 SockList sl;
1107 char buf[MAX_BUF]; 1066 char buf[MAX_BUF];
1108 uint16 flags; 1067 uint16 flags;
1109 1068
1110 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1069 packet sl;
1111 strcpy ((char *) sl.buf, "stats "); 1070 sl << "stats ";
1112 sl.len = strlen ((char *) sl.buf);
1113 1071
1114 if (pl->ob != NULL) 1072 if (pl->ob != NULL)
1115 { 1073 {
1116 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1074 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); 1075 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
… …
1126 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1084 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); 1085 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); 1086 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1129 } 1087 }
1130 1088
1131 if (pl->socket.exp64) 1089 if (pl->socket->exp64)
1132 { 1090 {
1133 uint8 s; 1091 uint8 s;
1134 1092
1135 for (s = 0; s < NUM_SKILLS; s++) 1093 for (s = 0; s < NUM_SKILLS; s++)
1136 { 1094 {
1137 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1095 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1138 { 1096 {
1139
1140 /* Always send along the level if exp changes. This is only 1097 /* Always send along the level if exp changes. This is only
1141 * 1 extra byte, but keeps processing simpler. 1098 * 1 extra byte, but keeps processing simpler.
1142 */ 1099 */
1143 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1100 sl << uint8 (s + CS_STAT_SKILLINFO)
1144 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1101 << uint8 (pl->last_skill_ob[s]->level)
1145 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1102 << uint64 (pl->last_skill_ob[s]->stats.exp);
1103
1146 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1104 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1147 } 1105 }
1148 } 1106 }
1149 } 1107 }
1150 1108
1151 if (pl->socket.exp64) 1109 if (pl->socket->exp64)
1152 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1110 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1153 else 1111 else
1154 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1112 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1155 1113
1156 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1114 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1169 if (pl->run_on) 1127 if (pl->run_on)
1170 flags |= SF_RUNON; 1128 flags |= SF_RUNON;
1171 1129
1172 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1130 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1173 1131
1174 if (pl->socket.sc_version < 1025) 1132 if (pl->socket->sc_version < 1025)
1175 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1133 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1176 else 1134 else
1177 { 1135 {
1178 int i; 1136 int i;
1179 1137
… …
1185 1143
1186 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1144 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1187 } 1145 }
1188 } 1146 }
1189 1147
1190 if (pl->socket.monitor_spells) 1148 if (pl->socket->monitor_spells)
1191 { 1149 {
1192 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1150 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); 1151 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); 1152 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1195 } 1153 }
1196 1154
1197 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1155 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); 1156 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1199 set_title (pl->ob, buf); 1157 set_title (pl->ob, buf);
1200 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1158 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1201 1159
1202 /* Only send it away if we have some actual data */ 1160 /* Only send it away if we have some actual data */
1203 if (sl.len > 6) 1161 if (sl.length () > 6)
1204 { 1162 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} 1163}
1213 1164
1214/** 1165/**
1215 * Tells the client that here is a player it should start using. 1166 * Tells the client that here is a player it should start using.
1216 */ 1167 */
1217void 1168void
1218esrv_new_player (player *pl, uint32 weight) 1169esrv_new_player (player *pl, uint32 weight)
1219{ 1170{
1220 SockList sl;
1221
1222 pl->last_weight = weight; 1171 pl->last_weight = weight;
1223 1172
1224 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1173 packet sl;
1174 sl << "player ";
1225 1175
1226 strcpy ((char *) sl.buf, "player "); 1176 sl << uint32 (pl->ob->count)
1227 sl.len = strlen ((char *) sl.buf); 1177 << uint32 (weight)
1228 SockList_AddInt (&sl, pl->ob->count); 1178 << uint32 (pl->ob->face->number)
1229 SockList_AddInt (&sl, weight); 1179 << data8 (pl->ob->name);
1230 SockList_AddInt (&sl, pl->ob->face->number);
1231 1180
1232 SockList_AddChar (&sl, (char) strlen (pl->ob->name)); 1181 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); 1182 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1239} 1183}
1240 1184
1241/** 1185/**
1242 * Need to send an animation sequence to the client. 1186 * Need to send an animation sequence to the client.
… …
1244 * sent them the face yet (this can become quite costly in terms of 1188 * 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 1189 * how much we are sending - on the other hand, this should only happen
1246 * when the player logs in and picks stuff up. 1190 * when the player logs in and picks stuff up.
1247 */ 1191 */
1248void 1192void
1249esrv_send_animation (NewSocket * ns, short anim_num) 1193esrv_send_animation (client_socket * ns, short anim_num)
1250{ 1194{
1251 SockList sl;
1252 int i; 1195 int i;
1253 1196
1254 /* Do some checking on the anim_num we got. Note that the animations 1197 /* 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 1198 * are added in contigous order, so if the number is in the valid
1256 * range, it must be a valid animation. 1199 * range, it must be a valid animation.
… …
1259 { 1202 {
1260 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1203 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1261 return; 1204 return;
1262 } 1205 }
1263 1206
1264 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1207 packet sl;
1265 strcpy ((char *) sl.buf, "anim "); 1208
1266 sl.len = 5; 1209 sl << "anim "
1267 SockList_AddShort (&sl, anim_num); 1210 << uint16 (anim_num)
1268 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1211 << uint16 (0); /* flags - not used right now */
1212
1269 /* Build up the list of faces. Also, send any information (ie, the 1213 /* Build up the list of faces. Also, send any information (ie, the
1270 * the face itself) down to the client. 1214 * the face itself) down to the client.
1271 */ 1215 */
1272 for (i = 0; i < animations[anim_num].num_animations; i++) 1216 for (i = 0; i < animations[anim_num].num_animations; i++)
1273 { 1217 {
1274 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1218 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1275 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1219 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1276 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1220 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1277 } 1221 }
1278 Send_With_Handling (ns, &sl); 1222
1279 free (sl.buf); 1223 ns->send_packet (sl);
1224
1280 ns->anims_sent[anim_num] = 1; 1225 ns->anims_sent[anim_num] = 1;
1281} 1226}
1282 1227
1283 1228
1284/****************************************************************************** 1229/******************************************************************************
… …
1290/** 1235/**
1291 * This adds face_num to a map cell at x,y. If the client doesn't have 1236 * 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. 1237 * the face yet, we will also send it.
1293 */ 1238 */
1294static void 1239static void
1295esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1240esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1296{ 1241{
1297 if (newmap->cells[x][y].count >= MAP_LAYERS) 1242 if (newmap->cells[x][y].count >= MAP_LAYERS)
1298 { 1243 {
1299 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1244 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1300 return; 1245 return;
1301 abort (); 1246 abort ();
1302 } 1247 }
1248
1303 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1249 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1304 newmap->cells[x][y].count++; 1250 newmap->cells[x][y].count++;
1251
1305 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1252 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1306 esrv_send_face (ns, face_num, 0); 1253 esrv_send_face (ns, face_num, 0);
1307} 1254}
1308 1255
1309struct LayerCell 1256struct LayerCell
… …
1318 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1265 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1319}; 1266};
1320 1267
1321/** Checkes if map cells have changed */ 1268/** Checkes if map cells have changed */
1322static int 1269static int
1323mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1270mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1324{ 1271{
1325 int k; 1272 int k;
1326 1273
1327 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1274 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1328 return 1; 1275 return 1;
… …
1341 * cnum is the client number, cur is the the buffer we put all of 1288 * 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 1289 * this data into. we return the end of the data. layers is
1343 * how many layers of data we should back. 1290 * how many layers of data we should back.
1344 */ 1291 */
1345static uint8 * 1292static uint8 *
1346compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1293compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1347{ 1294{
1348 int x, y, k; 1295 int x, y, k;
1349 int face; 1296 int face;
1350 unsigned char *fcur; 1297 unsigned char *fcur;
1351 struct MapLayer layers[MAP_LAYERS]; 1298 struct MapLayer layers[MAP_LAYERS];
… …
1411 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1358 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1412 } 1359 }
1413 return cur; 1360 return cur;
1414} 1361}
1415 1362
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
1452/** Clears a map cell */ 1363/** Clears a map cell */
1453static void 1364static void
1454map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1365map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1455{ 1366{
1456 cell->faces[0] = face0; 1367 cell->faces[0] = face0;
… …
1495 * needs to get sent - if so, it adds the data, sending the head 1406 * 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 1407 * if needed, and returning 1. If this no data needs to get
1497 * sent, it returns zero. 1408 * sent, it returns zero.
1498 */ 1409 */
1499static int 1410static int
1500check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1411check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1501{ 1412{
1502 short face_num; 1413 short face_num;
1503 1414
1504 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1415 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1505 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1416 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1506 else 1417 else
1507 face_num = 0; 1418 face_num = 0;
1508 1419
1509 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1420 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1510 { 1421 {
1511 SockList_AddShort (&sl, face_num); 1422 sl << uint16 (face_num);
1512 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1423 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1513 esrv_send_face (&ns, face_num, 0); 1424 esrv_send_face (&ns, face_num, 0);
1425
1514 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1426 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1515 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1427 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1516 return 1; 1428 return 1;
1517 } 1429 }
1518 1430
… …
1538 * the case, it seems to make more sense to have these layer values 1450 * the case, it seems to make more sense to have these layer values
1539 * actually match. 1451 * actually match.
1540 */ 1452 */
1541 1453
1542static int 1454static int
1543update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1455update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1544{ 1456{
1545 object *ob, *head; 1457 object *ob, *head;
1546 uint16 face_num; 1458 uint16 face_num;
1547 int bx, by, i; 1459 int bx, by, i;
1548 1460
1549 /* If there is a multipart object stored away, treat that as more important. 1461 /* If there is a multipart object stored away, treat that as more important.
1550 * If not, then do the normal processing. 1462 * If not, then do the normal processing.
1551 */ 1463 */
1552
1553 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1464 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1554 1465
1555 /* Check to see if this head is part of the set of objects 1466 /* Check to see if this head is part of the set of objects
1556 * we would normally send for this space. If so, then 1467 * we would normally send for this space. If so, then
1557 * don't use the head value. We need to do the check 1468 * don't use the head value. We need to do the check
… …
1722 1633
1723 /* Another hack - because of heads and whatnot, this face may match one 1634 /* 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 1635 * we already sent for a lower layer. In that case, don't send
1725 * this one. 1636 * this one.
1726 */ 1637 */
1727 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) 1638 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1728 {
1729 face_num = 0; 1639 face_num = 0;
1730 }
1731 1640
1732 /* We've gotten what face we want to use for the object. Now see if 1641 /* 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. 1642 * if it has changed since we last sent it to the client.
1734 */ 1643 */
1735 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1644 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1736 { 1645 {
1737 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1646 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1738 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1647 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1739 esrv_send_face (ns, face_num, 0); 1648 esrv_send_face (&ns, face_num, 0);
1740 SockList_AddShort (sl, face_num); 1649
1650 sl << uint16 (face_num);
1741 return 1; 1651 return 1;
1742 } 1652 }
1653
1743 /* Nothing changed */ 1654 /* Nothing changed */
1744 return 0; 1655 return 0;
1745} 1656}
1746 1657
1747/** 1658/**
… …
1762 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1673 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1763 * take. 1674 * take.
1764 */ 1675 */
1765 1676
1766static inline int 1677static inline int
1767update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1678update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1768{ 1679{
1769 object *ob; 1680 object *ob;
1770 int smoothlevel; /* old face_num; */ 1681 int smoothlevel; /* old face_num; */
1771 1682
1772 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1683 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1777 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1688 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1778 smoothlevel = 0; 1689 smoothlevel = 0;
1779 else 1690 else
1780 { 1691 {
1781 smoothlevel = ob->smoothlevel; 1692 smoothlevel = ob->smoothlevel;
1782 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1693 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1783 SendSmooth (ns, ob->face->number); 1694 SendSmooth (&ns, ob->face->number);
1784 } /* else not already head object or blank face */ 1695 } /* else not already head object or blank face */
1785 1696
1786 /* We've gotten what face we want to use for the object. Now see if 1697 /* 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. 1698 * if it has changed since we last sent it to the client.
1788 */ 1699 */
1789 if (smoothlevel > 255) 1700 if (smoothlevel > 255)
1790 smoothlevel = 255; 1701 smoothlevel = 255;
1791 else if (smoothlevel < 0) 1702 else if (smoothlevel < 0)
1792 smoothlevel = 0; 1703 smoothlevel = 0;
1704
1793 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1705 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1794 { 1706 {
1795 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1707 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1796 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1708 sl << uint8 (smoothlevel);
1797 return 1; 1709 return 1;
1798 } 1710 }
1711
1799 /* Nothing changed */ 1712 /* Nothing changed */
1800 return 0; 1713 return 0;
1801} 1714}
1802 1715
1803/** 1716/**
1804 * Returns the size of a data for a map square as returned by 1717 * Returns the size of a data for a map square as returned by
1805 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1718 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1806 * available. 1719 * available.
1807 */ 1720 */
1808int 1721int
1809getExtendedMapInfoSize (NewSocket * ns) 1722getExtendedMapInfoSize (client_socket * ns)
1810{ 1723{
1811 int result = 0; 1724 int result = 0;
1812 1725
1813 if (ns->ext_mapinfos) 1726 if (ns->ext_mapinfos)
1814 { 1727 {
… …
1844draw_client_map1 (object *pl) 1757draw_client_map1 (object *pl)
1845{ 1758{
1846 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1759 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1847 sint16 nx, ny; 1760 sint16 nx, ny;
1848 int estartlen, eoldlen; 1761 int estartlen, eoldlen;
1849 SockList sl;
1850 SockList esl; /*For extended Map info */
1851 uint16 mask, emask; 1762 uint16 mask, emask;
1852 uint8 eentrysize; 1763 uint8 eentrysize;
1853 uint16 ewhatstart, ewhatflag; 1764 uint16 ewhatstart, ewhatflag;
1854 uint8 extendedinfos; 1765 uint8 extendedinfos;
1855 maptile *m; 1766 maptile *m;
1856 1767
1857 NewSocket & socket = pl->contr->socket; 1768 client_socket &socket = *pl->contr->socket;
1858 1769
1859 check_map_change (pl->contr); 1770 check_map_change (pl->contr);
1860 1771
1861 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1772 packet sl;
1862 if (socket.mapmode == Map1Cmd) 1773 packet esl;
1863 strcpy ((char *) sl.buf, "map1 "); 1774
1864 else 1775 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1865 strcpy ((char *) sl.buf, "map1a ");
1866 sl.len = strlen ((char *) sl.buf);
1867 startlen = sl.len; 1776 startlen = sl.length ();
1868 1777
1869 /*Extendedmapinfo structure initialisation */ 1778 /*Extendedmapinfo structure initialisation */
1870 if (socket.ext_mapinfos) 1779 if (socket.ext_mapinfos)
1871 { 1780 {
1872 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1873 strcpy ((char *) esl.buf, "mapextended ");
1874 esl.len = strlen ((char *) esl.buf);
1875 extendedinfos = EMI_NOREDRAW; 1781 extendedinfos = EMI_NOREDRAW;
1876 1782
1877 if (socket.EMI_smooth) 1783 if (socket.EMI_smooth)
1878 extendedinfos |= EMI_SMOOTH; 1784 extendedinfos |= EMI_SMOOTH;
1879 1785
1880 ewhatstart = esl.len; 1786 ewhatstart = esl.length ();
1881 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1787 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1882 could need to be taken away */ 1788 could need to be taken away */
1883 SockList_AddChar (&esl, extendedinfos);
1884 eentrysize = getExtendedMapInfoSize (&socket); 1789 eentrysize = getExtendedMapInfoSize (&socket);
1885 SockList_AddChar (&esl, eentrysize); 1790 esl << "mapextended "
1791 << uint8 (extendedinfos)
1792 << uint8 (eentrysize);
1793
1886 estartlen = esl.len; 1794 estartlen = esl.length ();
1887 } 1795 }
1888 else 1796 else
1889 { 1797 {
1890 /* suppress compiler warnings */ 1798 /* suppress compiler warnings */
1891 ewhatstart = 0; 1799 ewhatstart = 0;
… …
1929 */ 1837 */
1930 if (ax >= socket.mapx || ay >= socket.mapy) 1838 if (ax >= socket.mapx || ay >= socket.mapy)
1931 { 1839 {
1932 int i, got_one; 1840 int i, got_one;
1933 1841
1934 oldlen = sl.len; 1842 oldlen = sl.length ();
1935 1843
1936 SockList_AddShort (&sl, mask); 1844 sl << uint16 (mask);
1937 1845
1938 if (check_head (sl, socket, ax, ay, 2)) 1846 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1939 mask |= 0x4;
1940 if (check_head (sl, socket, ax, ay, 1)) 1847 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1941 mask |= 0x2;
1942 if (check_head (sl, socket, ax, ay, 0)) 1848 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1943 mask |= 0x1;
1944 1849
1945 /* If all we are doing is sending 0 (blank) faces, we don't 1850 /* If all we are doing is sending 0 (blank) faces, we don't
1946 * actually need to send that - just the coordinates 1851 * actually need to send that - just the coordinates
1947 * with no faces tells the client to blank out the 1852 * with no faces tells the client to blank out the
1948 * space. 1853 * space.
1949 */ 1854 */
1950 got_one = 0; 1855 got_one = 0;
1951 for (i = oldlen + 2; i < sl.len; i++) 1856 for (i = oldlen + 2; i < sl.length (); i++)
1952 if (sl.buf[i]) 1857 if (sl[i])
1953 got_one = 1; 1858 got_one = 1;
1954 1859
1955 if (got_one && (mask & 0xf)) 1860 if (got_one && (mask & 0xf))
1956 sl.buf[oldlen + 1] = mask & 0xff; 1861 sl[oldlen + 1] = mask & 0xff;
1957 else 1862 else
1958 { /*either all faces blank, either no face at all */ 1863 { /*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 */ 1864 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1960 sl.len = oldlen + 2; 1865 sl.reset (oldlen + 2);
1961 else 1866 else
1962 sl.len = oldlen; 1867 sl.reset (oldlen);
1963 } 1868 }
1964 1869
1965 /*What concerns extendinfos, nothing to be done for now 1870 /*What concerns extendinfos, nothing to be done for now
1966 * (perhaps effects layer later) 1871 * (perhaps effects layer later)
1967 */ 1872 */
… …
1985 * if this hasn't already been done. If the space is out 1890 * if this hasn't already been done. If the space is out
1986 * of the map, it shouldn't have a head 1891 * of the map, it shouldn't have a head
1987 */ 1892 */
1988 if (lastcell.count != -1) 1893 if (lastcell.count != -1)
1989 { 1894 {
1990 SockList_AddShort (&sl, mask); 1895 sl << uint16 (mask);
1991 map_clearcell (&lastcell, 0, 0, 0, -1); 1896 map_clearcell (&lastcell, 0, 0, 0, -1);
1992 } 1897 }
1993 } 1898 }
1994 else if (d > 3) 1899 else if (d > 3)
1995 { 1900 {
… …
1997 1902
1998 /* This block deals with spaces that are not visible for whatever 1903 /* This block deals with spaces that are not visible for whatever
1999 * reason. Still may need to send the head for this space. 1904 * reason. Still may need to send the head for this space.
2000 */ 1905 */
2001 1906
2002 oldlen = sl.len; 1907 oldlen = sl.length ();
2003 1908
2004 SockList_AddShort (&sl, mask); 1909 sl << uint16 (mask);
2005 1910
2006 if (lastcell.count != -1) 1911 if (lastcell.count != -1)
2007 need_send = 1; 1912 need_send = 1;
2008 1913
2009 count = -1; 1914 count = -1;
2010 1915
2011 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1916 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2012 { 1917 {
2013 /* Now check to see if any heads need to be sent */ 1918 /* Now check to see if any heads need to be sent */
2014 1919
2015 if (check_head (sl, socket, ax, ay, 2)) 1920 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2016 mask |= 0x4;
2017 if (check_head (sl, socket, ax, ay, 1)) 1921 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2018 mask |= 0x2;
2019 if (check_head (sl, socket, ax, ay, 0)) 1922 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2020 mask |= 0x1;
2021 1923
2022 lastcell.count = count; 1924 lastcell.count = count;
2023 } 1925 }
2024 else 1926 else
2025 { 1927 {
… …
2030 1932
2031 map_clearcell (&lastcell, 0, 0, 0, count); 1933 map_clearcell (&lastcell, 0, 0, 0, count);
2032 } 1934 }
2033 1935
2034 if ((mask & 0xf) || need_send) 1936 if ((mask & 0xf) || need_send)
2035 sl.buf[oldlen + 1] = mask & 0xff; 1937 sl[oldlen + 1] = mask & 0xff;
2036 else 1938 else
2037 sl.len = oldlen; 1939 sl.reset (oldlen);
2038 } 1940 }
2039 else 1941 else
2040 { 1942 {
2041 /* In this block, the space is visible or there are head objects 1943 /* In this block, the space is visible or there are head objects
2042 * we need to send. 1944 * we need to send.
… …
2044 1946
2045 /* Rather than try to figure out what everything that we might 1947 /* Rather than try to figure out what everything that we might
2046 * need to send is, then form the packet after that, 1948 * need to send is, then form the packet after that,
2047 * we presume that we will in fact form a packet, and update 1949 * 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, 1950 * 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 1951 * we just back out sl.length () to the old value, and no harm
2050 * is done. 1952 * is done.
2051 * I think this is simpler than doing a bunch of checks to see 1953 * 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 1954 * what if anything we need to send, setting the bits, then
2053 * doing those checks again to add the real data. 1955 * doing those checks again to add the real data.
2054 */ 1956 */
2055 oldlen = sl.len; 1957 oldlen = sl.length ();
2056 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1958 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2057 eoldlen = esl.len; 1959 eoldlen = esl.length ();
2058 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1960 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2059 SockList_AddShort (&sl, mask); 1961 sl << uint16 (mask);
2060 1962
2061 if (socket.ext_mapinfos) 1963 if (socket.ext_mapinfos)
2062 SockList_AddShort (&esl, emask); 1964 esl << uint16 (emask);
2063 1965
2064 unsigned char dummy; 1966 unsigned char dummy;
2065 unsigned char *last_ext = &dummy; 1967 unsigned char *last_ext = &dummy;
2066 1968
2067 /* Darkness changed */ 1969 /* Darkness changed */
… …
2070 mask |= 0x8; 1972 mask |= 0x8;
2071 1973
2072 if (socket.extmap) 1974 if (socket.extmap)
2073 { 1975 {
2074 *last_ext |= 0x80; 1976 *last_ext |= 0x80;
2075 last_ext = sl.buf + sl.len; 1977 last_ext = &sl[sl.length ()];
2076 SockList_AddChar (&sl, d); 1978 sl << uint8 (d);
2077 } 1979 }
2078 else 1980 else
2079 SockList_AddChar (&sl, 255 - 64 * d); 1981 sl << uint8 (255 - 64 * d);
2080 } 1982 }
2081 1983
2082 lastcell.count = d; 1984 lastcell.count = d;
2083 1985
2084 if (socket.extmap) 1986 if (socket.extmap)
2085 { 1987 {
2086 uint8 stat_hp = 0; 1988 uint8 stat_hp = 0;
2087 uint8 stat_width = 0; 1989 uint8 stat_width = 0;
2088 uint8 flags = 0; 1990 uint8 flags = 0;
2089 tag_t player = 0; 1991 UUID player = 0;
2090 1992
2091 // send hp information, if applicable 1993 // send hp information, if applicable
2092 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1994 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2093 { 1995 {
2094 if (op->head || op->invisible) 1996 if (op->head || op->invisible)
… …
2114 { 2016 {
2115 lastcell.stat_hp = stat_hp; 2017 lastcell.stat_hp = stat_hp;
2116 2018
2117 mask |= 0x8; 2019 mask |= 0x8;
2118 *last_ext |= 0x80; 2020 *last_ext |= 0x80;
2119 last_ext = sl.buf + sl.len; 2021 last_ext = &sl[sl.length ()];
2120 SockList_AddChar (&sl, 5); 2022
2121 SockList_AddChar (&sl, stat_hp); 2023 sl << uint8 (5) << uint8 (stat_hp);
2122 2024
2123 if (stat_width > 1) 2025 if (stat_width > 1)
2124 { 2026 {
2125 *last_ext |= 0x80; 2027 *last_ext |= 0x80;
2126 last_ext = sl.buf + sl.len; 2028 last_ext = &sl[sl.length ()];
2127 SockList_AddChar (&sl, 6); 2029
2128 SockList_AddChar (&sl, stat_width); 2030 sl << uint8 (6) << uint8 (stat_width);
2129 } 2031 }
2130 } 2032 }
2131 2033
2132 if (lastcell.player != player) 2034 if (lastcell.player != player)
2133 { 2035 {
2134 lastcell.player = player; 2036 lastcell.player = player;
2135 2037
2136 mask |= 0x8; 2038 mask |= 0x8;
2137 *last_ext |= 0x80; 2039 *last_ext |= 0x80;
2138 last_ext = sl.buf + sl.len; 2040 last_ext = &sl[sl.length ()];
2139 SockList_AddChar (&sl, 0x47); 2041
2140 SockList_AddChar (&sl, 4); 2042 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2141 SockList_AddInt (&sl, player);
2142 } 2043 }
2143 2044
2144 if (lastcell.flags != flags) 2045 if (lastcell.flags != flags)
2145 { 2046 {
2146 lastcell.flags = flags; 2047 lastcell.flags = flags;
2147 2048
2148 mask |= 0x8; 2049 mask |= 0x8;
2149 *last_ext |= 0x80; 2050 *last_ext |= 0x80;
2150 last_ext = sl.buf + sl.len; 2051 last_ext = &sl[sl.length ()];
2151 SockList_AddChar (&sl, 8); 2052
2152 SockList_AddChar (&sl, flags); 2053 sl << uint8 (8) << uint8 (flags);
2153 } 2054 }
2154 } 2055 }
2155 2056
2156 /* Floor face */ 2057 /* Floor face */
2157 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 2058 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2158 mask |= 0x4; 2059 mask |= 0x4;
2159 2060
2160 if (socket.EMI_smooth) 2061 if (socket.EMI_smooth)
2161 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 2062 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2162 emask |= 0x4; 2063 emask |= 0x4;
2163 2064
2164 /* Middle face */ 2065 /* Middle face */
2165 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 2066 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2166 mask |= 0x2; 2067 mask |= 0x2;
2167 2068
2168 if (socket.EMI_smooth) 2069 if (socket.EMI_smooth)
2169 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 2070 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2170 emask |= 0x2; 2071 emask |= 0x2;
2171 2072
2172 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 2073 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2173 { 2074 {
2174 if (lastcell.faces[0] != pl->face->number) 2075 if (lastcell.faces[0] != pl->face->number)
… …
2177 mask |= 0x1; 2078 mask |= 0x1;
2178 2079
2179 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 2080 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2180 esrv_send_face (&socket, pl->face->number, 0); 2081 esrv_send_face (&socket, pl->face->number, 0);
2181 2082
2182 SockList_AddShort (&sl, pl->face->number); 2083 sl << uint16 (pl->face->number);
2183 } 2084 }
2184 } 2085 }
2185 else 2086 else
2186 { 2087 {
2187 /* Top face */ 2088 /* Top face */
2188 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 2089 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2189 mask |= 0x1; 2090 mask |= 0x1;
2190 2091
2191 if (socket.EMI_smooth) 2092 if (socket.EMI_smooth)
2192 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 2093 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2193 emask |= 0x1; 2094 emask |= 0x1;
2194 } 2095 }
2195 2096
2196 /* Check to see if we are in fact sending anything for this 2097 /* Check to see if we are in fact sending anything for this
2197 * space by checking the mask. If so, update the mask. 2098 * space by checking the mask. If so, update the mask.
2198 * if not, reset the len to that from before adding the mask 2099 * if not, reset the len to that from before adding the mask
2199 * value, so we don't send those bits. 2100 * value, so we don't send those bits.
2200 */ 2101 */
2201 if (mask & 0xf) 2102 if (mask & 0xf)
2202 sl.buf[oldlen + 1] = mask & 0xff; 2103 sl[oldlen + 1] = mask & 0xff;
2203 else 2104 else
2204 sl.len = oldlen; 2105 sl.reset (oldlen);
2205 2106
2206 if (emask & 0xf) 2107 if (emask & 0xf)
2207 esl.buf[eoldlen + 1] = emask & 0xff; 2108 esl[eoldlen + 1] = emask & 0xff;
2208 else 2109 else
2209 esl.len = eoldlen; 2110 esl.reset (eoldlen);
2210 } /* else this is a viewable space */ 2111 } /* else this is a viewable space */
2211 } /* for x loop */ 2112 } /* for x loop */
2212 } /* for y loop */ 2113 } /* for y loop */
2213 2114
2214 /* Verify that we in fact do need to send this */ 2115 /* Verify that we in fact do need to send this */
2215 if (socket.ext_mapinfos) 2116 if (socket.ext_mapinfos)
2216 { 2117 {
2217 if (!(sl.len > startlen || socket.sent_scroll)) 2118 if (!(sl.length () > startlen || socket.sent_scroll))
2218 { 2119 {
2219 /* No map data will follow, so don't say the client 2120 /* No map data will follow, so don't say the client
2220 * it doesn't need draw! 2121 * it doesn't need draw!
2221 */ 2122 */
2222 ewhatflag &= (~EMI_NOREDRAW); 2123 ewhatflag &= (~EMI_NOREDRAW);
2223 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2124 esl[ewhatstart + 1] = ewhatflag & 0xff;
2224 } 2125 }
2225 2126
2226 if (esl.len > estartlen) 2127 if (esl.length () > estartlen)
2227 Send_With_Handling (&socket, &esl); 2128 socket.send_packet (esl);
2228
2229 free (esl.buf);
2230 } 2129 }
2231 2130
2232 if (sl.len > startlen || socket.sent_scroll) 2131 if (sl.length () > startlen || socket.sent_scroll)
2233 { 2132 {
2234 Send_With_Handling (&socket, &sl); 2133 socket.send_packet (sl);
2235 socket.sent_scroll = 0; 2134 socket.sent_scroll = 0;
2236 } 2135 }
2237
2238 free (sl.buf);
2239} 2136}
2240 2137
2241/** 2138/**
2242 * Draws client map. 2139 * Draws client map.
2243 */ 2140 */
… …
2267 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2164 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2268 return; 2165 return;
2269 2166
2270 memset (&newmap, 0, sizeof (struct Map)); 2167 memset (&newmap, 0, sizeof (struct Map));
2271 2168
2272 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2169 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2273 { 2170 {
2274 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2171 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2275 { 2172 {
2276 ax = i; 2173 ax = i;
2277 ay = j; 2174 ay = j;
2278 m = pm; 2175 m = pm;
2279 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2176 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2294 { 2191 {
2295 update_los (pl); 2192 update_los (pl);
2296 pl->contr->do_los = 0; 2193 pl->contr->do_los = 0;
2297 } 2194 }
2298 2195
2299 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2300 {
2301 /* Big maps need a different drawing mechanism to work */ 2196 /* Big maps need a different drawing mechanism to work */
2302 draw_client_map1 (pl); 2197 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} 2198}
2366 2199
2367 2200
2368/*****************************************************************************/ 2201/*****************************************************************************/
2369 2202
… …
2375 2208
2376/*****************************************************************************/ 2209/*****************************************************************************/
2377void 2210void
2378send_plugin_custom_message (object *pl, char *buf) 2211send_plugin_custom_message (object *pl, char *buf)
2379{ 2212{
2380 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2213 pl->contr->socket->send_packet (buf);
2381} 2214}
2382 2215
2383/** 2216/**
2384 * This sends the skill number to name mapping. We ignore 2217 * This sends the skill number to name mapping. We ignore
2385 * the params - we always send the same info no matter what. 2218 * the params - we always send the same info no matter what.
2386 */ 2219 */
2387void 2220void
2388send_skill_info (NewSocket * ns, char *params) 2221send_skill_info (client_socket *ns, char *params)
2389{ 2222{
2390 SockList sl; 2223 packet sl;
2391 int i; 2224 sl << "replyinfo skill_info\n";
2392 2225
2393 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2394 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2395 for (i = 1; i < NUM_SKILLS; i++) 2226 for (int i = 1; i < NUM_SKILLS; i++)
2396 { 2227 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]); 2228
2398 }
2399 sl.len = strlen ((char *) sl.buf);
2400 if (sl.len >= MAXSOCKBUF) 2229 if (sl.length () >= MAXSOCKBUF)
2401 { 2230 {
2402 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2231 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2403 fatal (0); 2232 fatal (0);
2404 } 2233 }
2405 Send_With_Handling (ns, &sl); 2234
2406 free (sl.buf); 2235 ns->send_packet (sl);
2407} 2236}
2408 2237
2409/** 2238/**
2410 * This sends the spell path to name mapping. We ignore 2239 * This sends the spell path to name mapping. We ignore
2411 * the params - we always send the same info no matter what. 2240 * the params - we always send the same info no matter what.
2412 */ 2241 */
2413void 2242void
2414send_spell_paths (NewSocket * ns, char *params) 2243send_spell_paths (client_socket * ns, char *params)
2415{ 2244{
2416 SockList sl; 2245 packet sl;
2417 int i;
2418 2246
2419 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2247 sl << "replyinfo spell_paths\n";
2420 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2248
2421 for (i = 0; i < NRSPELLPATHS; i++) 2249 for (int i = 0; i < NRSPELLPATHS; i++)
2422 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2250 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2423 sl.len = strlen ((char *) sl.buf); 2251
2424 if (sl.len >= MAXSOCKBUF) 2252 if (sl.length () >= MAXSOCKBUF)
2425 { 2253 {
2426 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2254 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2427 fatal (0); 2255 fatal (0);
2428 } 2256 }
2429 Send_With_Handling (ns, &sl); 2257
2430 free (sl.buf); 2258 ns->send_packet (sl);
2431} 2259}
2432 2260
2433/** 2261/**
2434 * This looks for any spells the player may have that have changed their stats. 2262 * 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 2263 * it then sends an updspell packet for each spell that has changed in this way
2436 */ 2264 */
2437void 2265void
2438esrv_update_spells (player *pl) 2266esrv_update_spells (player *pl)
2439{ 2267{
2440 SockList sl;
2441 int flags = 0;
2442 object *spell;
2443
2444 if (!pl->socket.monitor_spells) 2268 if (!pl->socket->monitor_spells)
2445 return; 2269 return;
2270
2446 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2271 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2447 { 2272 {
2448 if (spell->type == SPELL) 2273 if (spell->type == SPELL)
2449 { 2274 {
2275 int flags = 0;
2276
2450 /* check if we need to update it */ 2277 /* check if we need to update it */
2451 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2278 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2452 { 2279 {
2453 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2280 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2454 flags |= UPD_SP_MANA; 2281 flags |= UPD_SP_MANA;
2455 } 2282 }
2283
2456 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2284 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2457 { 2285 {
2458 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2286 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2459 flags |= UPD_SP_GRACE; 2287 flags |= UPD_SP_GRACE;
2460 } 2288 }
2289
2461 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2290 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2462 { 2291 {
2463 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2292 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2464 flags |= UPD_SP_DAMAGE; 2293 flags |= UPD_SP_DAMAGE;
2465 } 2294 }
2295
2466 if (flags != 0) 2296 if (flags)
2467 { 2297 {
2468 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2298 packet sl;
2469 strcpy ((char *) sl.buf, "updspell "); 2299
2470 sl.len = strlen ((char *) sl.buf); 2300 sl << "updspell "
2471 SockList_AddChar (&sl, flags); 2301 << uint8 (flags)
2472 SockList_AddInt (&sl, spell->count); 2302 << uint32 (spell->count);
2473 if (flags & UPD_SP_MANA) 2303
2474 SockList_AddShort (&sl, spell->last_sp); 2304 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2475 if (flags & UPD_SP_GRACE) 2305 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2476 SockList_AddShort (&sl, spell->last_grace); 2306 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2477 if (flags & UPD_SP_DAMAGE) 2307
2478 SockList_AddShort (&sl, spell->last_eat); 2308 pl->socket->send_packet (sl);
2479 flags = 0;
2480 Send_With_Handling (&pl->socket, &sl);
2481 free (sl.buf);
2482 } 2309 }
2483 } 2310 }
2484 } 2311 }
2485} 2312}
2486 2313
2487void 2314void
2488esrv_remove_spell (player *pl, object *spell) 2315esrv_remove_spell (player *pl, object *spell)
2489{ 2316{
2490 SockList sl;
2491
2492 if (!pl->socket.monitor_spells) 2317 if (!pl->socket->monitor_spells)
2493 return; 2318 return;
2319
2494 if (!pl || !spell || spell->env != pl->ob) 2320 if (!pl || !spell || spell->env != pl->ob)
2495 { 2321 {
2496 LOG (llevError, "Invalid call to esrv_remove_spell"); 2322 LOG (llevError, "Invalid call to esrv_remove_spell");
2497 return; 2323 return;
2498 } 2324 }
2499 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2325
2500 strcpy ((char *) sl.buf, "delspell "); 2326 packet sl;
2501 sl.len = strlen ((char *) sl.buf); 2327
2502 SockList_AddInt (&sl, spell->count); 2328 sl << "delspell "
2503 Send_With_Handling (&pl->socket, &sl); 2329 << uint32 (spell->count);
2504 free (sl.buf); 2330
2331 pl->socket->send_packet (sl);
2505} 2332}
2506 2333
2507/* appends the spell *spell to the Socklist we will send the data to. */ 2334/* appends the spell *spell to the Socklist we will send the data to. */
2508static void 2335static void
2509append_spell (player *pl, SockList * sl, object *spell) 2336append_spell (player *pl, packet &sl, object *spell)
2510{ 2337{
2511 int len, i, skill = 0; 2338 int len, i, skill = 0;
2512 2339
2513 if (!(spell->name)) 2340 if (!(spell->name))
2514 { 2341 {
2515 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2342 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2516 return; 2343 return;
2517 } 2344 }
2518 SockList_AddInt (sl, spell->count); 2345
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 */ 2346 /* 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); 2347 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); 2348 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); 2349 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 2350
2530 /* figure out which skill it uses, if it uses one */ 2351 /* figure out which skill it uses, if it uses one */
2531 if (spell->skill) 2352 if (spell->skill)
2532 { 2353 {
2533 for (i = 1; i < NUM_SKILLS; i++) 2354 for (i = 1; i < NUM_SKILLS; i++)
… …
2535 { 2356 {
2536 skill = i + CS_STAT_SKILLINFO; 2357 skill = i + CS_STAT_SKILLINFO;
2537 break; 2358 break;
2538 } 2359 }
2539 } 2360 }
2540 SockList_AddChar (sl, skill);
2541 2361
2542 SockList_AddInt (sl, spell->path_attuned); 2362 /* send the current values */
2363 sl << uint32 (spell->count)
2364 << uint16 (spell->level)
2365 << uint16 (spell->casting_time)
2366 << uint16 (spell->last_sp)
2367 << uint16 (spell->last_grace)
2368 << uint16 (spell->last_eat)
2369 << uint8 (skill)
2370 << uint32 (spell->path_attuned)
2543 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2371 << uint32 (spell->face ? spell->face->number : 0)
2544 2372 << data8 (spell->name)
2545 len = strlen (spell->name); 2373 << 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} 2374}
2562 2375
2563/** 2376/**
2564 * This tells the client to add the spell *ob, if *ob is NULL, then add 2377 * This tells the client to add the spell *ob, if *ob is NULL, then add
2565 * all spells in the player's inventory. 2378 * all spells in the player's inventory.
2566 */ 2379 */
2567void 2380void
2568esrv_add_spells (player *pl, object *spell) 2381esrv_add_spells (player *pl, object *spell)
2569{ 2382{
2570 SockList sl;
2571
2572 if (!pl) 2383 if (!pl)
2573 { 2384 {
2574 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2385 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2575 return; 2386 return;
2576 } 2387 }
2388
2577 if (!pl->socket.monitor_spells) 2389 if (!pl->socket->monitor_spells)
2578 return; 2390 return;
2579 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2391
2580 strcpy ((char *) sl.buf, "addspell "); 2392 packet sl;
2581 sl.len = strlen ((char *) sl.buf); 2393
2394 sl << "addspell ";
2395
2582 if (!spell) 2396 if (!spell)
2583 { 2397 {
2584 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2398 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2585 { 2399 {
2586 /* were we to simply keep appending data here, we could exceed 2400 /* 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 2410 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2597 * like it will fix this 2411 * like it will fix this
2598 */ 2412 */
2599 if (spell->type != SPELL) 2413 if (spell->type != SPELL)
2600 continue; 2414 continue;
2415
2601 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2416 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2602 { 2417 {
2603 Send_With_Handling (&pl->socket, &sl); 2418 pl->socket->send_packet (sl);
2604 strcpy ((char *) sl.buf, "addspell "); 2419
2605 sl.len = strlen ((char *) sl.buf); 2420 sl.reset ();
2421 sl << "addspell ";
2606 } 2422 }
2423
2607 append_spell (pl, &sl, spell); 2424 append_spell (pl, sl, spell);
2608 } 2425 }
2609 } 2426 }
2610 else if (spell->type != SPELL) 2427 else if (spell->type != SPELL)
2611 { 2428 {
2612 LOG (llevError, "Asked to send a non-spell object as a spell"); 2429 LOG (llevError, "Asked to send a non-spell object as a spell");
2613 return; 2430 return;
2614 } 2431 }
2615 else 2432 else
2616 append_spell (pl, &sl, spell); 2433 append_spell (pl, sl, spell);
2434
2617 if (sl.len >= MAXSOCKBUF) 2435 if (sl.length () >= MAXSOCKBUF)
2618 { 2436 {
2619 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2437 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2620 fatal (0); 2438 fatal (0);
2621 } 2439 }
2440
2622 /* finally, we can send the packet */ 2441 /* finally, we can send the packet */
2623 Send_With_Handling (&pl->socket, &sl); 2442 pl->socket->send_packet (sl);
2624 free (sl.buf);
2625} 2443}
2444

Diff Legend

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