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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.29 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.41 by root, Fri Dec 15 19:59:20 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
54#include <newclient.h>
55#include <newserver.h>
56#include <living.h> 51#include <living.h>
57#include <commands.h> 52#include <commands.h>
58 53
59/* This block is basically taken from socket.c - I assume if it works there, 54/* This block is basically taken from socket.c - I assume if it works there,
60 * it should work here. 55 * it should work here.
… …
63#include <sys/time.h> 58#include <sys/time.h>
64#include <sys/socket.h> 59#include <sys/socket.h>
65#include <netinet/in.h> 60#include <netinet/in.h>
66#include <netdb.h> 61#include <netdb.h>
67 62
68#ifdef HAVE_UNISTD_H
69# include <unistd.h> 63#include <unistd.h>
70#endif
71
72#ifdef HAVE_SYS_TIME_H
73# include <sys/time.h> 64#include <sys/time.h>
74#endif
75 65
76#include "sounds.h" 66#include "sounds.h"
77 67
78/** 68/**
79 * This table translates the attack numbers as used within the 69 * This table translates the attack numbers as used within the
… …
96 -1, /* life stealing */ 86 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 87 -1 /* Disease - not fully done yet */
98}; 88};
99 89
100static void 90static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 91socket_map_scroll (client * ns, int dx, int dy)
102{ 92{
103 struct Map newmap; 93 struct Map newmap;
104 int x, y, mx, my; 94 int x, y, mx, my;
105 95
106 { 96 {
107 char buf[MAXSOCKBUF]; 97 packet sl;
108 98
109 sprintf (buf, "map_scroll %d %d", dx, dy); 99 sl.printf ("map_scroll %d %d", dx, dy);
110 Write_String_To_Socket (ns, buf, strlen (buf)); 100 ns->send_packet (sl);
111 } 101 }
112 102
113 /* If we are using the Map1aCmd, we may in fact send 103 /* If we are using the Map1aCmd, we may in fact send
114 * head information that is outside the viewable map. 104 * head information that is outside the viewable map.
115 * So set the mx,my to the max value we want to 105 * So set the mx,my to the max value we want to
… …
156} 146}
157 147
158static void 148static void
159clear_map (player *pl) 149clear_map (player *pl)
160{ 150{
161 NewSocket & socket = pl->socket; 151 client &socket = *pl->socket;
162 152
163 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 153 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
164 154
165 if (socket.newmapcmd == 1) 155 if (socket.newmapcmd == 1)
166 Write_String_To_Socket (&socket, "newmap", 6); 156 socket.send_packet ("newmap");
167 157
168 socket.update_look = 1; 158 socket.update_look = 1;
169 socket.look_position = 0; 159 socket.look_position = 0;
170} 160}
171 161
172/** check for map change and send new map data */ 162/** check for map change and send new map data */
173static void 163static void
174check_map_change (player *pl) 164check_map_change (player *pl)
175{ 165{
176 NewSocket & socket = pl->socket; 166 client &socket = *pl->socket;
177 object *ob = pl->ob; 167 object *ob = pl->ob;
178 char buf[MAX_BUF]; /* eauugggh */ 168 char buf[MAX_BUF]; /* eauugggh */
179 169
180 if (socket.current_map != ob->map) 170 if (socket.current_map != ob->map)
181 { 171 {
… …
202 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 192 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
203 } 193 }
204 else 194 else
205 snprintf (buf, MAX_BUF, "mapinfo current"); 195 snprintf (buf, MAX_BUF, "mapinfo current");
206 196
207 Write_String_To_Socket (&socket, buf, strlen (buf)); 197 socket.send_packet (buf);
208 } 198 }
209 } 199 }
210 else if (socket.current_x != ob->x || socket.current_y != ob->y) 200 else if (socket.current_x != ob->x || socket.current_y != ob->y)
211 { 201 {
212 int dx = ob->x - socket.current_x; 202 int dx = ob->x - socket.current_x;
… …
222 } 212 }
223 } 213 }
224 214
225 socket.current_x = ob->x; 215 socket.current_x = ob->x;
226 socket.current_y = ob->y; 216 socket.current_y = ob->y;
217}
218
219/**
220 * RequestInfo is sort of a meta command. There is some specific
221 * request of information, but we call other functions to provide
222 * that information.
223 */
224void
225RequestInfo (char *buf, int len, client * ns)
226{
227 char *params = NULL, *cp;
228
229 /* No match */
230 char bigbuf[MAX_BUF];
231 int slen;
232
233 /* Set up replyinfo before we modify any of the buffers - this is used
234 * if we don't find a match.
235 */
236 strcpy (bigbuf, "replyinfo ");
237 slen = strlen (bigbuf);
238 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
239
240 /* find the first space, make it null, and update the
241 * params pointer.
242 */
243 for (cp = buf; *cp != '\0'; cp++)
244 if (*cp == ' ')
245 {
246 *cp = '\0';
247 params = cp + 1;
248 break;
249 }
250
251 if (!strcmp (buf, "image_info"))
252 send_image_info (ns, params);
253 else if (!strcmp (buf, "image_sums"))
254 send_image_sums (ns, params);
255 else if (!strcmp (buf, "skill_info"))
256 send_skill_info (ns, params);
257 else if (!strcmp (buf, "spell_paths"))
258 send_spell_paths (ns, params);
259 else
260 ns->send_packet (bigbuf, len);
227} 261}
228 262
229void 263void
230ExtCmd (char *buf, int len, player *pl) 264ExtCmd (char *buf, int len, player *pl)
231{ 265{
… …
252 buf += 8; 286 buf += 8;
253 287
254 // initial map and its origin 288 // initial map and its origin
255 maptile *map = pl->ob->map; 289 maptile *map = pl->ob->map;
256 sint16 dx, dy; 290 sint16 dx, dy;
257 int mapx = pl->socket.mapx / 2 - pl->ob->x; 291 int mapx = pl->socket->mapx / 2 - pl->ob->x;
258 int mapy = pl->socket.mapy / 2 - pl->ob->y; 292 int mapy = pl->socket->mapy / 2 - pl->ob->y;
259 int max_distance = 8; // limit maximum path length to something generous 293 int max_distance = 8; // limit maximum path length to something generous
260 294
261 while (*buf && map && max_distance) 295 while (*buf && map && max_distance)
262 { 296 {
263 int dir = *buf++; 297 int dir = *buf++;
… …
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 348 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
315 } 349 }
316 else 350 else
317 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 351 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
318 352
319 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 353 pl->socket->send_packet (bigbuf);
320} 354}
321 355
322/** This is the Setup cmd - easy first implementation */ 356/** This is the Setup cmd - easy first implementation */
323void 357void
324SetUp (char *buf, int len, NewSocket * ns) 358SetUp (char *buf, int len, client * ns)
325{ 359{
326 int s, slen; 360 int s, slen;
327 char *cmd, *param, cmdback[HUGE_BUF]; 361 char *cmd, *param, cmdback[HUGE_BUF];
328 362
329 /* run through the cmds of setup 363 /* run through the cmds of setup
… …
331 * 365 *
332 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 366 * 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 367 * The client then must sort this out
334 */ 368 */
335 369
336 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 370 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
371
337 strcpy (cmdback, "setup"); 372 strcpy (cmdback, "setup");
338 for (s = 0; s < len;) 373 for (s = 0; s < len; )
339 { 374 {
340
341 cmd = &buf[s]; 375 cmd = &buf[s];
342 376
343 /* find the next space, and put a null there */ 377 /* find the next space, and put a null there */
344 for (; buf[s] && buf[s] != ' '; s++); 378 for (; buf[s] && buf[s] != ' '; s++)
379 ;
380
345 buf[s++] = 0; 381 buf[s++] = 0;
382
346 while (buf[s] == ' ') 383 while (buf[s] == ' ')
347 s++; 384 s++;
348 385
349 if (s >= len) 386 if (s >= len)
350 break; 387 break;
351 388
352 param = &buf[s]; 389 param = &buf[s];
353 390
354 for (; buf[s] && buf[s] != ' '; s++); 391 for (; buf[s] && buf[s] != ' '; s++)
392 ;
393
355 buf[s++] = 0; 394 buf[s++] = 0;
395
356 while (buf[s] == ' ') 396 while (buf[s] == ' ')
357 s++; 397 s++;
358 398
359 slen = strlen (cmdback); 399 slen = strlen (cmdback);
360 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 400 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
521 * report a failure to the client. 561 * report a failure to the client.
522 */ 562 */
523 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 563 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
524 } 564 }
525 } /* for processing all the setup commands */ 565 } /* for processing all the setup commands */
566
526 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 567 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
527 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 568 ns->send_packet (cmdback);
528} 569}
529 570
530/** 571/**
531 * The client has requested to be added to the game. 572 * 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. 573 * 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, 574 * 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. 575 * it either has to be here or init_sockets needs to be exported.
535 */ 576 */
536void 577void
537AddMeCmd (char *buf, int len, NewSocket * ns) 578AddMeCmd (char *buf, int len, client * ns)
538{ 579{
539 Settings oldsettings; 580 Settings oldsettings;
540 581
541 oldsettings = settings; 582 oldsettings = settings;
542 if (ns->status != Ns_Add || add_player (ns)) 583 if (ns->status != Ns_Add || add_player (ns))
543 { 584 ns->send_packet ("addme_failed");
544 Write_String_To_Socket (ns, "addme_failed", 12);
545 }
546 else 585 else
547 { 586 ns->send_packet ("addme_success");
548 /* Basically, the add_player copies the socket structure into 587
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; 588 settings = oldsettings;
558} 589}
559 590
560/** Reply to ExtendedInfos command */ 591/** Reply to ExtendedInfos command */
561void 592void
562ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 593ToggleExtendedInfos (char *buf, int len, client * ns)
563{ 594{
564 char cmdback[MAX_BUF]; 595 char cmdback[MAX_BUF];
565 char command[50]; 596 char command[50];
566 int info, nextinfo; 597 int info, nextinfo;
567 598
… …
605 { 636 {
606 strcat (cmdback, " "); 637 strcat (cmdback, " ");
607 strcat (cmdback, "smoothing"); 638 strcat (cmdback, "smoothing");
608 } 639 }
609 640
610 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 641 ns->send_packet (cmdback);
611} 642}
612 643
613/* 644/*
614#define MSG_TYPE_BOOK 1 645#define MSG_TYPE_BOOK 1
615#define MSG_TYPE_CARD 2 646#define MSG_TYPE_CARD 2
… …
618#define MSG_TYPE_MONUMENT 5 649#define MSG_TYPE_MONUMENT 5
619#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 650#define MSG_TYPE_SCRIPTED_DIALOG 6*/
620 651
621/** Reply to ExtendedInfos command */ 652/** Reply to ExtendedInfos command */
622void 653void
623ToggleExtendedText (char *buf, int len, NewSocket * ns) 654ToggleExtendedText (char *buf, int len, client * ns)
624{ 655{
625 char cmdback[MAX_BUF]; 656 char cmdback[MAX_BUF];
626 char temp[10]; 657 char temp[10];
627 char command[50]; 658 char command[50];
628 int info, nextinfo, i, flag; 659 int info, nextinfo, i, flag;
… …
668 strcat (cmdback, " "); 699 strcat (cmdback, " ");
669 snprintf (temp, sizeof (temp), "%d", i); 700 snprintf (temp, sizeof (temp), "%d", i);
670 strcat (cmdback, temp); 701 strcat (cmdback, temp);
671 } 702 }
672 703
673 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 704 ns->send_packet (cmdback);
674} 705}
675 706
676/** 707/**
677 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 708 * 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 709 * 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 710 * 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 711 * if we know the client wants it, might as well push it to the
681 * client. 712 * client.
682 */ 713 */
683static void 714static void
684SendSmooth (NewSocket * ns, uint16 face) 715SendSmooth (client * ns, uint16 face)
685{ 716{
686 uint16 smoothface; 717 uint16 smoothface;
687 718
688 /* If we can't find a face, return and set it so we won't try to send this 719 /* If we can't find a face, return and set it so we won't try to send this
689 * again. 720 * again.
… …
699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 730 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
700 esrv_send_face (ns, smoothface, 0); 731 esrv_send_face (ns, smoothface, 0);
701 732
702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 733 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
703 734
704 SockList sl (MAXSOCKBUF); 735 packet sl;
705 736
706 sl << "smooth " 737 sl << "smooth "
707 << uint16 (face) 738 << uint16 (face)
708 << uint16 (smoothface); 739 << uint16 (smoothface);
709 740
710 Send_With_Handling (ns, &sl); 741 ns->send_packet (sl);
711 sl.free ();
712} 742}
713 743
714 /** 744 /**
715 * Tells client the picture it has to use 745 * Tells client the picture it has to use
716 * to smooth a picture number given as argument. 746 * to smooth a picture number given as argument.
717 */ 747 */
718void 748void
719AskSmooth (char *buf, int len, NewSocket * ns) 749AskSmooth (char *buf, int len, client * ns)
720{ 750{
721 uint16 facenbr; 751 uint16 facenbr;
722 752
723 facenbr = atoi (buf); 753 facenbr = atoi (buf);
724 SendSmooth (ns, facenbr); 754 SendSmooth (ns, facenbr);
… …
781 * etc.). It is a lot like PlayerCmd above, but is called with the 811 * etc.). It is a lot like PlayerCmd above, but is called with the
782 * 'ncom' method which gives more information back to the client so it 812 * 'ncom' method which gives more information back to the client so it
783 * can throttle. 813 * can throttle.
784 */ 814 */
785void 815void
786NewPlayerCmd (uint8 * buf, int len, player *pl) 816NewPlayerCmd (char *buf, int len, player *pl)
787{ 817{
788 int time, repeat; 818 int time, repeat;
789 char command[MAX_BUF]; 819 char command[MAX_BUF];
790 short packet; 820 int pktlen;
791 821
792 if (len < 7) 822 if (len < 7)
793 { 823 {
794 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 824 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
795 return; 825 return;
796 } 826 }
797 827
798 packet = GetShort_String (buf); 828 pktlen = net_uint16 ((uint8 *)buf);
799 repeat = GetInt_String (buf + 2); 829 repeat = net_uint32 ((uint8 *)buf + 2);
830
800 /* -1 is special - no repeat, but don't update */ 831 /* -1 is special - no repeat, but don't update */
801 if (repeat != -1) 832 if (repeat != -1)
802 pl->count = repeat; 833 pl->count = repeat;
803 834
804 if ((len - 4) >= MAX_BUF) 835 if ((len - 4) >= MAX_BUF)
805 len = MAX_BUF - 5; 836 len = MAX_BUF - 5;
806 837
807 strncpy ((char *) command, (char *) buf + 6, len - 4); 838 strncpy ((char *) command, (char *) buf + 6, len - 4);
808 command[len - 4] = '\0'; 839 command[len - 4] = 0;
809
810 /* The following should never happen with a proper or honest client.
811 * Therefore, the error message doesn't have to be too clear - if
812 * someone is playing with a hacked/non working client, this gives them
813 * an idea of the problem, but they deserve what they get
814 */
815 if (pl->state != ST_PLAYING)
816 {
817 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
818 return;
819 }
820 840
821 /* This should not happen anymore. */ 841 /* This should not happen anymore. */
822 if (pl->ob->speed_left < -1.0) 842 if (pl->ob->speed_left < -1.0)
823 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 843 LOG (llevError, "Player has negative time - shouldn't do command.\n");
824 844
… …
836 else 856 else
837 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 857 time = (int) (MAX_TIME / FABS (pl->ob->speed));
838 858
839 /* Send confirmation of command execution now */ 859 /* Send confirmation of command execution now */
840 860
841 SockList sl (MAXSOCKBUF); 861 packet sl;
842 sl << "comc " << uint16 (packet) << uint32 (time); 862 sl << "comc " << uint16 (pktlen) << uint32 (time);
843 Send_With_Handling (&pl->socket, &sl); 863 pl->socket->send_packet (sl);
844 sl.free ();
845} 864}
846 865
847 866
848/** This is a reply to a previous query. */ 867/** This is a reply to a previous query. */
849void 868void
… …
916 * something older than the server. If we assume the client will be 935 * something older than the server. If we assume the client will be
917 * backwards compatible, having it be a later version should not be a 936 * backwards compatible, having it be a later version should not be a
918 * problem. 937 * problem.
919 */ 938 */
920void 939void
921VersionCmd (char *buf, int len, NewSocket * ns) 940VersionCmd (char *buf, int len, client * ns)
922{ 941{
923 char *cp; 942 char *cp;
924 char version_warning[256]; 943 char version_warning[256];
925 944
926 if (!buf) 945 if (!buf)
… …
950 cp = strchr (cp + 1, ' '); 969 cp = strchr (cp + 1, ' ');
951 if (cp) 970 if (cp)
952 { 971 {
953 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 972 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
954 973
955 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 974 assign (ns->version, cp + 1);
956 975
957 /* This is first implementation - i skip all beta DX clients with it
958 * Add later stuff here for other clients
959 */
960
961 /* these are old dxclients */
962 /* Version 1024 added support for singular + plural name values -
963 * requiing this minimal value reduces complexity of that code, and it
964 * has been around for a long time.
965 */
966 if (ns->sc_version < 1026) 976 if (ns->sc_version < 1026)
967 { 977 {
968 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 978 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
969 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 979 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
970 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 980 ns->send_packet (version_warning);
971 } 981 }
972 982
973 } 983 }
974} 984}
975 985
976/** sound related functions. */ 986/** sound related functions. */
977
978void 987void
979SetSound (char *buf, int len, NewSocket * ns) 988SetSound (char *buf, int len, client * ns)
980{ 989{
981 ns->sound = atoi (buf); 990 ns->sound = atoi (buf);
982} 991}
983 992
984/** client wants the map resent */ 993/** client wants the map resent */
… …
994 */ 1003 */
995#if 0 1004#if 0
996 /* Okay, this is MAJOR UGLY. but the only way I know how to 1005 /* Okay, this is MAJOR UGLY. but the only way I know how to
997 * clear the "cache" 1006 * clear the "cache"
998 */ 1007 */
999 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 1008 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1000 draw_client_map (pl->ob); 1009 draw_client_map (pl->ob);
1001#endif 1010#endif
1002} 1011}
1003 1012
1004/** 1013/**
… …
1042/** 1051/**
1043 * Asks the client to query the user. This way, the client knows 1052 * Asks the client to query the user. This way, the client knows
1044 * it needs to send something back (vs just printing out a message) 1053 * it needs to send something back (vs just printing out a message)
1045 */ 1054 */
1046void 1055void
1047send_query (NewSocket * ns, uint8 flags, char *text) 1056send_query (client * ns, uint8 flags, char *text)
1048{ 1057{
1049 char buf[MAX_BUF]; 1058 char buf[MAX_BUF];
1050 1059
1051 sprintf (buf, "query %d %s", flags, text ? text : ""); 1060 sprintf (buf, "query %d %s", flags, text ? text : "");
1052 Write_String_To_Socket (ns, buf, strlen (buf)); 1061 ns->send_packet (buf);
1053} 1062}
1054 1063
1055#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1064#define AddIfInt64(Old,New,Type) if (Old != New) {\
1056 Old = New; \ 1065 Old = New; \
1057 sl << uint8 (Type) << uint64 (New); \ 1066 sl << uint8 (Type) << uint64 (New); \
… …
1087esrv_update_stats (player *pl) 1096esrv_update_stats (player *pl)
1088{ 1097{
1089 char buf[MAX_BUF]; 1098 char buf[MAX_BUF];
1090 uint16 flags; 1099 uint16 flags;
1091 1100
1092 SockList sl (MAXSOCKBUF); 1101 packet sl;
1093 sl << "stats "; 1102 sl << "stats ";
1094 1103
1095 if (pl->ob != NULL) 1104 if (pl->ob != NULL)
1096 { 1105 {
1097 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1106 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
… …
1107 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1116 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1108 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1117 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1109 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1118 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1110 } 1119 }
1111 1120
1112 if (pl->socket.exp64) 1121 if (pl->socket->exp64)
1113 { 1122 {
1114 uint8 s; 1123 uint8 s;
1115 1124
1116 for (s = 0; s < NUM_SKILLS; s++) 1125 for (s = 0; s < NUM_SKILLS; s++)
1117 { 1126 {
… …
1127 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1136 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1128 } 1137 }
1129 } 1138 }
1130 } 1139 }
1131 1140
1132 if (pl->socket.exp64) 1141 if (pl->socket->exp64)
1133 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1142 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1134 else 1143 else
1135 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1144 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1136 1145
1137 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1146 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1150 if (pl->run_on) 1159 if (pl->run_on)
1151 flags |= SF_RUNON; 1160 flags |= SF_RUNON;
1152 1161
1153 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1162 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1154 1163
1155 if (pl->socket.sc_version < 1025) 1164 if (pl->socket->sc_version < 1025)
1156 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1165 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1157 else 1166 else
1158 { 1167 {
1159 int i; 1168 int i;
1160 1169
… …
1166 1175
1167 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1176 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1168 } 1177 }
1169 } 1178 }
1170 1179
1171 if (pl->socket.monitor_spells) 1180 if (pl->socket->monitor_spells)
1172 { 1181 {
1173 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1182 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1174 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1183 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1175 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1184 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1176 } 1185 }
1177 1186
1178 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1187 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1179 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1188 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1180 set_title (pl->ob, buf); 1189 set_title (pl->ob, buf);
1181 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1190 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1182 1191
1183 /* Only send it away if we have some actual data */ 1192 /* Only send it away if we have some actual data */
1184 if (sl.len > 6) 1193 if (sl.length () > 6)
1185 { 1194 pl->socket->send_packet (sl);
1186#ifdef ESRV_DEBUG
1187 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1188#endif
1189 Send_With_Handling (&pl->socket, &sl);
1190 }
1191
1192 sl.free ();
1193} 1195}
1194 1196
1195/** 1197/**
1196 * Tells the client that here is a player it should start using. 1198 * Tells the client that here is a player it should start using.
1197 */ 1199 */
1198void 1200void
1199esrv_new_player (player *pl, uint32 weight) 1201esrv_new_player (player *pl, uint32 weight)
1200{ 1202{
1201 pl->last_weight = weight; 1203 pl->last_weight = weight;
1202 1204
1203 SockList sl (MAXSOCKBUF); 1205 packet sl;
1204 sl << "player "; 1206 sl << "player ";
1205 1207
1206 sl << uint32 (pl->ob->count) 1208 sl << uint32 (pl->ob->count)
1207 << uint32 (weight) 1209 << uint32 (weight)
1208 << uint32 (pl->ob->face->number) 1210 << uint32 (pl->ob->face->number)
1209 << data8 (pl->ob->name); 1211 << data8 (pl->ob->name);
1210 1212
1211 Send_With_Handling (&pl->socket, &sl); 1213 pl->socket->send_packet (sl);
1212 sl.free ();
1213 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1214 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1214} 1215}
1215 1216
1216/** 1217/**
1217 * Need to send an animation sequence to the client. 1218 * Need to send an animation sequence to the client.
… …
1219 * sent them the face yet (this can become quite costly in terms of 1220 * sent them the face yet (this can become quite costly in terms of
1220 * how much we are sending - on the other hand, this should only happen 1221 * how much we are sending - on the other hand, this should only happen
1221 * when the player logs in and picks stuff up. 1222 * when the player logs in and picks stuff up.
1222 */ 1223 */
1223void 1224void
1224esrv_send_animation (NewSocket * ns, short anim_num) 1225esrv_send_animation (client * ns, short anim_num)
1225{ 1226{
1226 int i; 1227 int i;
1227 1228
1228 /* Do some checking on the anim_num we got. Note that the animations 1229 /* Do some checking on the anim_num we got. Note that the animations
1229 * are added in contigous order, so if the number is in the valid 1230 * are added in contigous order, so if the number is in the valid
… …
1233 { 1234 {
1234 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1235 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1235 return; 1236 return;
1236 } 1237 }
1237 1238
1238 SockList sl (MAXSOCKBUF); 1239 packet sl;
1239 1240
1240 sl << "anim " 1241 sl << "anim "
1241 << uint16 (anim_num) 1242 << uint16 (anim_num)
1242 << uint16 (0); /* flags - not used right now */ 1243 << uint16 (0); /* flags - not used right now */
1243 1244
… …
1249 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1250 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1250 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1251 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1251 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1252 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1252 } 1253 }
1253 1254
1254 Send_With_Handling (ns, &sl); 1255 ns->send_packet (sl);
1255 sl.free ();
1256 1256
1257 ns->anims_sent[anim_num] = 1; 1257 ns->anims_sent[anim_num] = 1;
1258} 1258}
1259 1259
1260 1260
… …
1267/** 1267/**
1268 * This adds face_num to a map cell at x,y. If the client doesn't have 1268 * This adds face_num to a map cell at x,y. If the client doesn't have
1269 * the face yet, we will also send it. 1269 * the face yet, we will also send it.
1270 */ 1270 */
1271static void 1271static void
1272esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1272esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1273{ 1273{
1274 if (newmap->cells[x][y].count >= MAP_LAYERS) 1274 if (newmap->cells[x][y].count >= MAP_LAYERS)
1275 { 1275 {
1276 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1276 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1277 return; 1277 return;
… …
1297 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1297 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1298}; 1298};
1299 1299
1300/** Checkes if map cells have changed */ 1300/** Checkes if map cells have changed */
1301static int 1301static int
1302mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1302mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1303{ 1303{
1304 int k; 1304 int k;
1305 1305
1306 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1306 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1307 return 1; 1307 return 1;
… …
1320 * cnum is the client number, cur is the the buffer we put all of 1320 * cnum is the client number, cur is the the buffer we put all of
1321 * this data into. we return the end of the data. layers is 1321 * this data into. we return the end of the data. layers is
1322 * how many layers of data we should back. 1322 * how many layers of data we should back.
1323 */ 1323 */
1324static uint8 * 1324static uint8 *
1325compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1325compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1326{ 1326{
1327 int x, y, k; 1327 int x, y, k;
1328 int face; 1328 int face;
1329 unsigned char *fcur; 1329 unsigned char *fcur;
1330 struct MapLayer layers[MAP_LAYERS]; 1330 struct MapLayer layers[MAP_LAYERS];
… …
1390 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1390 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1391 } 1391 }
1392 return cur; 1392 return cur;
1393} 1393}
1394 1394
1395static void
1396esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1397{
1398 static long frames, bytes, tbytes, tframes;
1399 char *cur;
1400
1401 SockList sl (MAXSOCKBUF);
1402 sl << "map ";
1403
1404 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1405 sl.len = cur - (char *) sl.buf;
1406
1407/* LOG(llevDebug, "Sending map command.\n");*/
1408
1409 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1410 {
1411 /* All of this is just accounting stuff */
1412 if (tframes > 100)
1413 tframes = tbytes = 0;
1414
1415 tframes++;
1416 frames++;
1417 tbytes += sl.len;
1418 bytes += sl.len;
1419 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1420 Send_With_Handling (ns, &sl);
1421 ns->sent_scroll = 0;
1422 }
1423
1424 sl.free ();
1425}
1426
1427
1428/** Clears a map cell */ 1395/** Clears a map cell */
1429static void 1396static void
1430map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1397map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1431{ 1398{
1432 cell->faces[0] = face0; 1399 cell->faces[0] = face0;
… …
1471 * needs to get sent - if so, it adds the data, sending the head 1438 * needs to get sent - if so, it adds the data, sending the head
1472 * if needed, and returning 1. If this no data needs to get 1439 * if needed, and returning 1. If this no data needs to get
1473 * sent, it returns zero. 1440 * sent, it returns zero.
1474 */ 1441 */
1475static int 1442static int
1476check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1443check_head (packet &sl, client &ns, int ax, int ay, int layer)
1477{ 1444{
1478 short face_num; 1445 short face_num;
1479 1446
1480 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1447 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1481 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1448 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1482 else 1449 else
1483 face_num = 0; 1450 face_num = 0;
1484 1451
1485 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1452 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1486 { 1453 {
1487 SockList_AddShort (&sl, face_num); 1454 sl << uint16 (face_num);
1488 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1455 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1489 esrv_send_face (&ns, face_num, 0); 1456 esrv_send_face (&ns, face_num, 0);
1490 1457
1491 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1458 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1492 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1459 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
… …
1515 * the case, it seems to make more sense to have these layer values 1482 * the case, it seems to make more sense to have these layer values
1516 * actually match. 1483 * actually match.
1517 */ 1484 */
1518 1485
1519static int 1486static int
1520update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1487update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1521{ 1488{
1522 object *ob, *head; 1489 object *ob, *head;
1523 uint16 face_num; 1490 uint16 face_num;
1524 int bx, by, i; 1491 int bx, by, i;
1525 1492
… …
1738 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1705 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1739 * take. 1706 * take.
1740 */ 1707 */
1741 1708
1742static inline int 1709static inline int
1743update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1710update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1744{ 1711{
1745 object *ob; 1712 object *ob;
1746 int smoothlevel; /* old face_num; */ 1713 int smoothlevel; /* old face_num; */
1747 1714
1748 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1715 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1782 * Returns the size of a data for a map square as returned by 1749 * Returns the size of a data for a map square as returned by
1783 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1750 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1784 * available. 1751 * available.
1785 */ 1752 */
1786int 1753int
1787getExtendedMapInfoSize (NewSocket * ns) 1754getExtendedMapInfoSize (client * ns)
1788{ 1755{
1789 int result = 0; 1756 int result = 0;
1790 1757
1791 if (ns->ext_mapinfos) 1758 if (ns->ext_mapinfos)
1792 { 1759 {
… …
1828 uint8 eentrysize; 1795 uint8 eentrysize;
1829 uint16 ewhatstart, ewhatflag; 1796 uint16 ewhatstart, ewhatflag;
1830 uint8 extendedinfos; 1797 uint8 extendedinfos;
1831 maptile *m; 1798 maptile *m;
1832 1799
1833 NewSocket &socket = pl->contr->socket; 1800 client &socket = *pl->contr->socket;
1834 1801
1835 check_map_change (pl->contr); 1802 check_map_change (pl->contr);
1836 1803
1837 SockList sl (MAXSOCKBUF); 1804 packet sl;
1838 SockList esl (MAXSOCKBUF); 1805 packet esl;
1839 1806
1840 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1807 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1841 startlen = sl.len; 1808 startlen = sl.length ();
1842 1809
1843 /*Extendedmapinfo structure initialisation */ 1810 /*Extendedmapinfo structure initialisation */
1844 if (socket.ext_mapinfos) 1811 if (socket.ext_mapinfos)
1845 { 1812 {
1846 extendedinfos = EMI_NOREDRAW; 1813 extendedinfos = EMI_NOREDRAW;
1847 1814
1848 if (socket.EMI_smooth) 1815 if (socket.EMI_smooth)
1849 extendedinfos |= EMI_SMOOTH; 1816 extendedinfos |= EMI_SMOOTH;
1850 1817
1851 ewhatstart = esl.len; 1818 ewhatstart = esl.length ();
1852 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1819 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1853 could need to be taken away */ 1820 could need to be taken away */
1854 eentrysize = getExtendedMapInfoSize (&socket); 1821 eentrysize = getExtendedMapInfoSize (&socket);
1855 esl << "mapextended " 1822 esl << "mapextended "
1856 << uint8 (extendedinfos) 1823 << uint8 (extendedinfos)
1857 << uint8 (eentrysize); 1824 << uint8 (eentrysize);
1825
1858 estartlen = esl.len; 1826 estartlen = esl.length ();
1859 } 1827 }
1860 else 1828 else
1861 { 1829 {
1862 /* suppress compiler warnings */ 1830 /* suppress compiler warnings */
1863 ewhatstart = 0; 1831 ewhatstart = 0;
… …
1901 */ 1869 */
1902 if (ax >= socket.mapx || ay >= socket.mapy) 1870 if (ax >= socket.mapx || ay >= socket.mapy)
1903 { 1871 {
1904 int i, got_one; 1872 int i, got_one;
1905 1873
1906 oldlen = sl.len; 1874 oldlen = sl.length ();
1907 1875
1908 sl << uint16 (mask); 1876 sl << uint16 (mask);
1909 1877
1910 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1878 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1911 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1879 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1915 * actually need to send that - just the coordinates 1883 * actually need to send that - just the coordinates
1916 * with no faces tells the client to blank out the 1884 * with no faces tells the client to blank out the
1917 * space. 1885 * space.
1918 */ 1886 */
1919 got_one = 0; 1887 got_one = 0;
1920 for (i = oldlen + 2; i < sl.len; i++) 1888 for (i = oldlen + 2; i < sl.length (); i++)
1921 if (sl.buf[i]) 1889 if (sl[i])
1922 got_one = 1; 1890 got_one = 1;
1923 1891
1924 if (got_one && (mask & 0xf)) 1892 if (got_one && (mask & 0xf))
1925 sl.buf[oldlen + 1] = mask & 0xff; 1893 sl[oldlen + 1] = mask & 0xff;
1926 else 1894 else
1927 { /*either all faces blank, either no face at all */ 1895 { /*either all faces blank, either no face at all */
1928 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1896 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1929 sl.len = oldlen + 2; 1897 sl.reset (oldlen + 2);
1930 else 1898 else
1931 sl.len = oldlen; 1899 sl.reset (oldlen);
1932 } 1900 }
1933 1901
1934 /*What concerns extendinfos, nothing to be done for now 1902 /*What concerns extendinfos, nothing to be done for now
1935 * (perhaps effects layer later) 1903 * (perhaps effects layer later)
1936 */ 1904 */
… …
1966 1934
1967 /* This block deals with spaces that are not visible for whatever 1935 /* This block deals with spaces that are not visible for whatever
1968 * reason. Still may need to send the head for this space. 1936 * reason. Still may need to send the head for this space.
1969 */ 1937 */
1970 1938
1971 oldlen = sl.len; 1939 oldlen = sl.length ();
1972 1940
1973 sl << uint16 (mask); 1941 sl << uint16 (mask);
1974 1942
1975 if (lastcell.count != -1) 1943 if (lastcell.count != -1)
1976 need_send = 1; 1944 need_send = 1;
… …
1996 1964
1997 map_clearcell (&lastcell, 0, 0, 0, count); 1965 map_clearcell (&lastcell, 0, 0, 0, count);
1998 } 1966 }
1999 1967
2000 if ((mask & 0xf) || need_send) 1968 if ((mask & 0xf) || need_send)
2001 sl.buf[oldlen + 1] = mask & 0xff; 1969 sl[oldlen + 1] = mask & 0xff;
2002 else 1970 else
2003 sl.len = oldlen; 1971 sl.reset (oldlen);
2004 } 1972 }
2005 else 1973 else
2006 { 1974 {
2007 /* In this block, the space is visible or there are head objects 1975 /* In this block, the space is visible or there are head objects
2008 * we need to send. 1976 * we need to send.
… …
2010 1978
2011 /* Rather than try to figure out what everything that we might 1979 /* Rather than try to figure out what everything that we might
2012 * need to send is, then form the packet after that, 1980 * need to send is, then form the packet after that,
2013 * we presume that we will in fact form a packet, and update 1981 * we presume that we will in fact form a packet, and update
2014 * the bits by what we do actually send. If we send nothing, 1982 * the bits by what we do actually send. If we send nothing,
2015 * we just back out sl.len to the old value, and no harm 1983 * we just back out sl.length () to the old value, and no harm
2016 * is done. 1984 * is done.
2017 * I think this is simpler than doing a bunch of checks to see 1985 * I think this is simpler than doing a bunch of checks to see
2018 * what if anything we need to send, setting the bits, then 1986 * what if anything we need to send, setting the bits, then
2019 * doing those checks again to add the real data. 1987 * doing those checks again to add the real data.
2020 */ 1988 */
2021 oldlen = sl.len; 1989 oldlen = sl.length ();
2022 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1990 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2023 eoldlen = esl.len; 1991 eoldlen = esl.length ();
2024 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1992 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2025 sl << uint16 (mask); 1993 sl << uint16 (mask);
2026 1994
2027 if (socket.ext_mapinfos) 1995 if (socket.ext_mapinfos)
2028 esl << uint16 (emask); 1996 esl << uint16 (emask);
… …
2036 mask |= 0x8; 2004 mask |= 0x8;
2037 2005
2038 if (socket.extmap) 2006 if (socket.extmap)
2039 { 2007 {
2040 *last_ext |= 0x80; 2008 *last_ext |= 0x80;
2041 last_ext = sl.buf + sl.len; 2009 last_ext = &sl[sl.length ()];
2042 sl << uint8 (d); 2010 sl << uint8 (d);
2043 } 2011 }
2044 else 2012 else
2045 sl << uint8 (255 - 64 * d); 2013 sl << uint8 (255 - 64 * d);
2046 } 2014 }
… …
2080 { 2048 {
2081 lastcell.stat_hp = stat_hp; 2049 lastcell.stat_hp = stat_hp;
2082 2050
2083 mask |= 0x8; 2051 mask |= 0x8;
2084 *last_ext |= 0x80; 2052 *last_ext |= 0x80;
2085 last_ext = sl.buf + sl.len; 2053 last_ext = &sl[sl.length ()];
2086 2054
2087 sl << uint8 (5) << uint8 (stat_hp); 2055 sl << uint8 (5) << uint8 (stat_hp);
2088 2056
2089 if (stat_width > 1) 2057 if (stat_width > 1)
2090 { 2058 {
2091 *last_ext |= 0x80; 2059 *last_ext |= 0x80;
2092 last_ext = sl.buf + sl.len; 2060 last_ext = &sl[sl.length ()];
2093 2061
2094 sl << uint8 (6) << uint8 (stat_width); 2062 sl << uint8 (6) << uint8 (stat_width);
2095 } 2063 }
2096 } 2064 }
2097 2065
… …
2099 { 2067 {
2100 lastcell.player = player; 2068 lastcell.player = player;
2101 2069
2102 mask |= 0x8; 2070 mask |= 0x8;
2103 *last_ext |= 0x80; 2071 *last_ext |= 0x80;
2104 last_ext = sl.buf + sl.len; 2072 last_ext = &sl[sl.length ()];
2105 2073
2106 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 2074 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2107 } 2075 }
2108 2076
2109 if (lastcell.flags != flags) 2077 if (lastcell.flags != flags)
2110 { 2078 {
2111 lastcell.flags = flags; 2079 lastcell.flags = flags;
2112 2080
2113 mask |= 0x8; 2081 mask |= 0x8;
2114 *last_ext |= 0x80; 2082 *last_ext |= 0x80;
2115 last_ext = sl.buf + sl.len; 2083 last_ext = &sl[sl.length ()];
2116 2084
2117 sl << uint8 (8) << uint8 (flags); 2085 sl << uint8 (8) << uint8 (flags);
2118 } 2086 }
2119 } 2087 }
2120 2088
… …
2162 * space by checking the mask. If so, update the mask. 2130 * space by checking the mask. If so, update the mask.
2163 * if not, reset the len to that from before adding the mask 2131 * if not, reset the len to that from before adding the mask
2164 * value, so we don't send those bits. 2132 * value, so we don't send those bits.
2165 */ 2133 */
2166 if (mask & 0xf) 2134 if (mask & 0xf)
2167 sl.buf[oldlen + 1] = mask & 0xff; 2135 sl[oldlen + 1] = mask & 0xff;
2168 else 2136 else
2169 sl.len = oldlen; 2137 sl.reset (oldlen);
2170 2138
2171 if (emask & 0xf) 2139 if (emask & 0xf)
2172 esl.buf[eoldlen + 1] = emask & 0xff; 2140 esl[eoldlen + 1] = emask & 0xff;
2173 else 2141 else
2174 esl.len = eoldlen; 2142 esl.reset (eoldlen);
2175 } /* else this is a viewable space */ 2143 } /* else this is a viewable space */
2176 } /* for x loop */ 2144 } /* for x loop */
2177 } /* for y loop */ 2145 } /* for y loop */
2178 2146
2179 /* Verify that we in fact do need to send this */ 2147 /* Verify that we in fact do need to send this */
2180 if (socket.ext_mapinfos) 2148 if (socket.ext_mapinfos)
2181 { 2149 {
2182 if (!(sl.len > startlen || socket.sent_scroll)) 2150 if (!(sl.length () > startlen || socket.sent_scroll))
2183 { 2151 {
2184 /* No map data will follow, so don't say the client 2152 /* No map data will follow, so don't say the client
2185 * it doesn't need draw! 2153 * it doesn't need draw!
2186 */ 2154 */
2187 ewhatflag &= (~EMI_NOREDRAW); 2155 ewhatflag &= (~EMI_NOREDRAW);
2188 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2156 esl[ewhatstart + 1] = ewhatflag & 0xff;
2189 } 2157 }
2190 2158
2191 if (esl.len > estartlen) 2159 if (esl.length () > estartlen)
2192 Send_With_Handling (&socket, &esl); 2160 socket.send_packet (esl);
2193 } 2161 }
2194 2162
2195 if (sl.len > startlen || socket.sent_scroll) 2163 if (sl.length () > startlen || socket.sent_scroll)
2196 { 2164 {
2197 Send_With_Handling (&socket, &sl); 2165 socket.send_packet (sl);
2198 socket.sent_scroll = 0; 2166 socket.sent_scroll = 0;
2199 } 2167 }
2200
2201 sl.free ();
2202 esl.free ();
2203} 2168}
2204 2169
2205/** 2170/**
2206 * Draws client map. 2171 * Draws client map.
2207 */ 2172 */
… …
2231 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2196 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2232 return; 2197 return;
2233 2198
2234 memset (&newmap, 0, sizeof (struct Map)); 2199 memset (&newmap, 0, sizeof (struct Map));
2235 2200
2236 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2201 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2237 { 2202 {
2238 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2203 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2239 { 2204 {
2240 ax = i; 2205 ax = i;
2241 ay = j; 2206 ay = j;
2242 m = pm; 2207 m = pm;
2243 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2208 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2258 { 2223 {
2259 update_los (pl); 2224 update_los (pl);
2260 pl->contr->do_los = 0; 2225 pl->contr->do_los = 0;
2261 } 2226 }
2262 2227
2263 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2264 {
2265 /* Big maps need a different drawing mechanism to work */ 2228 /* Big maps need a different drawing mechanism to work */
2266 draw_client_map1 (pl); 2229 draw_client_map1 (pl);
2267 return;
2268 }
2269
2270 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2271 {
2272 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2273 }
2274
2275 /* j and i are the y and x coordinates of the real map (which is
2276 * basically some number of spaces around the player)
2277 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2278 * left corner) and are thus disconnected from the map values.
2279 * Subtract 1 from the max values so that we properly handle cases where
2280 * player has specified an even map. Otherwise, we try to send them too
2281 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2282 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2283 * odd, this still works fine.
2284 */
2285 ay = 0;
2286 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2287 {
2288 ax = 0;
2289 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2290 {
2291
2292 d = pl->contr->blocked_los[ax][ay];
2293 /* note the out_of_map and d>3 checks are both within the same
2294 * negation check.
2295 */
2296 nx = i;
2297 ny = j;
2298 m = get_map_from_coord (pm, &nx, &ny);
2299 if (m && d < 4)
2300 {
2301 face = GET_MAP_FACE (m, nx, ny, 0);
2302 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2303 floor = GET_MAP_FACE (m, nx, ny, 2);
2304
2305 /* If all is blank, send a blank face. */
2306 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2307 {
2308 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2309 }
2310 else
2311 { /* actually have something interesting */
2312 /* send the darkness mask, if any. */
2313 if (d && pl->contr->socket.darkness)
2314 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2315
2316 if (face && face != blank_face)
2317 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2318 if (floor2 && floor2 != blank_face)
2319 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2320 if (floor && floor != blank_face)
2321 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2322 }
2323 } /* Is a valid space */
2324 }
2325 }
2326
2327 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2328
2329 check_map_change (pl->contr);
2330} 2230}
2331 2231
2332 2232
2333/*****************************************************************************/ 2233/*****************************************************************************/
2334 2234
… …
2340 2240
2341/*****************************************************************************/ 2241/*****************************************************************************/
2342void 2242void
2343send_plugin_custom_message (object *pl, char *buf) 2243send_plugin_custom_message (object *pl, char *buf)
2344{ 2244{
2345 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2245 pl->contr->socket->send_packet (buf);
2346} 2246}
2347 2247
2348/** 2248/**
2349 * This sends the skill number to name mapping. We ignore 2249 * This sends the skill number to name mapping. We ignore
2350 * the params - we always send the same info no matter what. 2250 * the params - we always send the same info no matter what.
2351 */ 2251 */
2352void 2252void
2353send_skill_info (NewSocket *ns, char *params) 2253send_skill_info (client *ns, char *params)
2354{ 2254{
2355 SockList sl (MAXSOCKBUF); 2255 packet sl;
2356 sl << "replyinfo skill_info\n"; 2256 sl << "replyinfo skill_info\n";
2357 2257
2358 for (int i = 1; i < NUM_SKILLS; i++) 2258 for (int i = 1; i < NUM_SKILLS; i++)
2359 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2259 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2360 2260
2361 if (sl.len >= MAXSOCKBUF) 2261 if (sl.length () >= MAXSOCKBUF)
2362 { 2262 {
2363 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2263 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2364 fatal (0); 2264 fatal (0);
2365 } 2265 }
2366 2266
2367 Send_With_Handling (ns, &sl); 2267 ns->send_packet (sl);
2368 sl.free ();
2369} 2268}
2370 2269
2371/** 2270/**
2372 * This sends the spell path to name mapping. We ignore 2271 * This sends the spell path to name mapping. We ignore
2373 * the params - we always send the same info no matter what. 2272 * the params - we always send the same info no matter what.
2374 */ 2273 */
2375void 2274void
2376send_spell_paths (NewSocket * ns, char *params) 2275send_spell_paths (client * ns, char *params)
2377{ 2276{
2378 SockList sl (MAXSOCKBUF); 2277 packet sl;
2379 2278
2380 sl << "replyinfo spell_paths\n"; 2279 sl << "replyinfo spell_paths\n";
2381 2280
2382 for (int i = 0; i < NRSPELLPATHS; i++) 2281 for (int i = 0; i < NRSPELLPATHS; i++)
2383 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2282 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2384 2283
2385 if (sl.len >= MAXSOCKBUF) 2284 if (sl.length () >= MAXSOCKBUF)
2386 { 2285 {
2387 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2286 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2388 fatal (0); 2287 fatal (0);
2389 } 2288 }
2390 2289
2391 Send_With_Handling (ns, &sl); 2290 ns->send_packet (sl);
2392 sl.free ();
2393} 2291}
2394 2292
2395/** 2293/**
2396 * This looks for any spells the player may have that have changed their stats. 2294 * This looks for any spells the player may have that have changed their stats.
2397 * it then sends an updspell packet for each spell that has changed in this way 2295 * it then sends an updspell packet for each spell that has changed in this way
2398 */ 2296 */
2399void 2297void
2400esrv_update_spells (player *pl) 2298esrv_update_spells (player *pl)
2401{ 2299{
2402 if (!pl->socket.monitor_spells) 2300 if (!pl->socket->monitor_spells)
2403 return; 2301 return;
2404 2302
2405 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2303 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2406 { 2304 {
2407 if (spell->type == SPELL) 2305 if (spell->type == SPELL)
… …
2427 flags |= UPD_SP_DAMAGE; 2325 flags |= UPD_SP_DAMAGE;
2428 } 2326 }
2429 2327
2430 if (flags) 2328 if (flags)
2431 { 2329 {
2432 SockList sl (MAXSOCKBUF); 2330 packet sl;
2433 2331
2434 sl << "updspell " 2332 sl << "updspell "
2435 << uint8 (flags) 2333 << uint8 (flags)
2436 << uint32 (spell->count); 2334 << uint32 (spell->count);
2437 2335
2438 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2336 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2439 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2337 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2440 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2338 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2441 2339
2442 Send_With_Handling (&pl->socket, &sl); 2340 pl->socket->send_packet (sl);
2443 sl.free ();
2444 } 2341 }
2445 } 2342 }
2446 } 2343 }
2447} 2344}
2448 2345
2449void 2346void
2450esrv_remove_spell (player *pl, object *spell) 2347esrv_remove_spell (player *pl, object *spell)
2451{ 2348{
2452 if (!pl->socket.monitor_spells) 2349 if (!pl->socket->monitor_spells)
2453 return; 2350 return;
2454 2351
2455 if (!pl || !spell || spell->env != pl->ob) 2352 if (!pl || !spell || spell->env != pl->ob)
2456 { 2353 {
2457 LOG (llevError, "Invalid call to esrv_remove_spell"); 2354 LOG (llevError, "Invalid call to esrv_remove_spell");
2458 return; 2355 return;
2459 } 2356 }
2460 2357
2461 SockList sl (MAXSOCKBUF); 2358 packet sl;
2462 2359
2463 sl << "delspell " 2360 sl << "delspell "
2464 << uint32 (spell->count); 2361 << uint32 (spell->count);
2465 2362
2466 Send_With_Handling (&pl->socket, &sl); 2363 pl->socket->send_packet (sl);
2467 sl.free ();
2468} 2364}
2469 2365
2470/* appends the spell *spell to the Socklist we will send the data to. */ 2366/* appends the spell *spell to the Socklist we will send the data to. */
2471static void 2367static void
2472append_spell (player *pl, SockList &sl, object *spell) 2368append_spell (player *pl, packet &sl, object *spell)
2473{ 2369{
2474 int len, i, skill = 0; 2370 int len, i, skill = 0;
2475 2371
2476 if (!(spell->name)) 2372 if (!(spell->name))
2477 { 2373 {
… …
2520 { 2416 {
2521 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2417 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2522 return; 2418 return;
2523 } 2419 }
2524 2420
2525 if (!pl->socket.monitor_spells) 2421 if (!pl->socket->monitor_spells)
2526 return; 2422 return;
2527 2423
2528 SockList sl (MAXSOCKBUF); 2424 packet sl;
2529 2425
2530 sl << "addspell "; 2426 sl << "addspell ";
2531 2427
2532 if (!spell) 2428 if (!spell)
2533 { 2429 {
… …
2547 * like it will fix this 2443 * like it will fix this
2548 */ 2444 */
2549 if (spell->type != SPELL) 2445 if (spell->type != SPELL)
2550 continue; 2446 continue;
2551 2447
2552 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2448 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2553 { 2449 {
2554 Send_With_Handling (&pl->socket, &sl); 2450 pl->socket->send_packet (sl);
2555 strcpy ((char *) sl.buf, "addspell "); 2451
2556 sl.len = strlen ((char *) sl.buf); 2452 sl.reset ();
2453 sl << "addspell ";
2557 } 2454 }
2558 2455
2559 append_spell (pl, sl, spell); 2456 append_spell (pl, sl, spell);
2560 } 2457 }
2561 } 2458 }
… …
2572 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2469 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2573 fatal (0); 2470 fatal (0);
2574 } 2471 }
2575 2472
2576 /* finally, we can send the packet */ 2473 /* finally, we can send the packet */
2577 Send_With_Handling (&pl->socket, &sl); 2474 pl->socket->send_packet (sl);
2578
2579 sl.free ();
2580} 2475}
2581 2476

Diff Legend

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