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

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

Diff Legend

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