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.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 676
688 /* 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
689 * again. 678 * again.
… …
699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 688 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
700 esrv_send_face (ns, smoothface, 0); 689 esrv_send_face (ns, smoothface, 0);
701 690
702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 691 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
703 692
704 SockList sl (MAXSOCKBUF); 693 packet sl;
705 694
706 sl << "smooth " 695 sl << "smooth "
707 << uint16 (face) 696 << uint16 (face)
708 << uint16 (smoothface); 697 << uint16 (smoothface);
709 698
710 Send_With_Handling (ns, &sl); 699 ns->send_packet (sl);
711 sl.free ();
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);
… …
781 * 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
782 * '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
783 * can throttle. 771 * can throttle.
784 */ 772 */
785void 773void
786NewPlayerCmd (uint8 * buf, int len, player *pl) 774NewPlayerCmd (char *buf, int len, player *pl)
787{ 775{
788 int time, repeat; 776 int time, repeat;
789 char command[MAX_BUF]; 777 char command[MAX_BUF];
790 short packet; 778 int pktlen;
791 779
792 if (len < 7) 780 if (len < 7)
793 { 781 {
794 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);
795 return; 783 return;
796 } 784 }
797 785
798 packet = GetShort_String (buf); 786 pktlen = net_uint16 ((uint8 *)buf);
799 repeat = GetInt_String (buf + 2); 787 repeat = net_uint32 ((uint8 *)buf + 2);
788
800 /* -1 is special - no repeat, but don't update */ 789 /* -1 is special - no repeat, but don't update */
801 if (repeat != -1) 790 if (repeat != -1)
802 pl->count = repeat; 791 pl->count = repeat;
803 792
804 if ((len - 4) >= MAX_BUF) 793 if ((len - 4) >= MAX_BUF)
805 len = MAX_BUF - 5; 794 len = MAX_BUF - 5;
806 795
807 strncpy ((char *) command, (char *) buf + 6, len - 4); 796 strncpy ((char *) command, (char *) buf + 6, len - 4);
808 command[len - 4] = '\0'; 797 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 798
821 /* This should not happen anymore. */ 799 /* This should not happen anymore. */
822 if (pl->ob->speed_left < -1.0) 800 if (pl->ob->speed_left < -1.0)
823 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 801 LOG (llevError, "Player has negative time - shouldn't do command.\n");
824 802
… …
836 else 814 else
837 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 815 time = (int) (MAX_TIME / FABS (pl->ob->speed));
838 816
839 /* Send confirmation of command execution now */ 817 /* Send confirmation of command execution now */
840 818
841 SockList sl (MAXSOCKBUF); 819 packet sl;
842 sl << "comc " << uint16 (packet) << uint32 (time); 820 sl << "comc " << uint16 (pktlen) << uint32 (time);
843 Send_With_Handling (&pl->socket, &sl); 821 pl->socket->send_packet (sl);
844 sl.free ();
845} 822}
846 823
847 824
848/** This is a reply to a previous query. */ 825/** This is a reply to a previous query. */
849void 826void
… …
916 * 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
917 * 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
918 * problem. 895 * problem.
919 */ 896 */
920void 897void
921VersionCmd (char *buf, int len, NewSocket * ns) 898VersionCmd (char *buf, int len, client_socket * ns)
922{ 899{
923 char *cp; 900 char *cp;
924 char version_warning[256]; 901 char version_warning[256];
925 902
926 if (!buf) 903 if (!buf)
… …
965 */ 942 */
966 if (ns->sc_version < 1026) 943 if (ns->sc_version < 1026)
967 { 944 {
968 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 945 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
969 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 946 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
970 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 947 ns->send_packet (version_warning);
971 } 948 }
972 949
973 } 950 }
974} 951}
975 952
976/** sound related functions. */ 953/** sound related functions. */
977 954
978void 955void
979SetSound (char *buf, int len, NewSocket * ns) 956SetSound (char *buf, int len, client_socket * ns)
980{ 957{
981 ns->sound = atoi (buf); 958 ns->sound = atoi (buf);
982} 959}
983 960
984/** client wants the map resent */ 961/** client wants the map resent */
… …
994 */ 971 */
995#if 0 972#if 0
996 /* 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
997 * clear the "cache" 974 * clear the "cache"
998 */ 975 */
999 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 976 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1000 draw_client_map (pl->ob); 977 draw_client_map (pl->ob);
1001#endif 978#endif
1002} 979}
1003 980
1004/** 981/**
… …
1042/** 1019/**
1043 * 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
1044 * 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)
1045 */ 1022 */
1046void 1023void
1047send_query (NewSocket * ns, uint8 flags, char *text) 1024send_query (client_socket * ns, uint8 flags, char *text)
1048{ 1025{
1049 char buf[MAX_BUF]; 1026 char buf[MAX_BUF];
1050 1027
1051 sprintf (buf, "query %d %s", flags, text ? text : ""); 1028 sprintf (buf, "query %d %s", flags, text ? text : "");
1052 Write_String_To_Socket (ns, buf, strlen (buf)); 1029 ns->send_packet (buf);
1053} 1030}
1054 1031
1055#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1032#define AddIfInt64(Old,New,Type) if (Old != New) {\
1056 Old = New; \ 1033 Old = New; \
1057 sl << uint8 (Type) << uint64 (New); \ 1034 sl << uint8 (Type) << uint64 (New); \
… …
1087esrv_update_stats (player *pl) 1064esrv_update_stats (player *pl)
1088{ 1065{
1089 char buf[MAX_BUF]; 1066 char buf[MAX_BUF];
1090 uint16 flags; 1067 uint16 flags;
1091 1068
1092 SockList sl (MAXSOCKBUF); 1069 packet sl;
1093 sl << "stats "; 1070 sl << "stats ";
1094 1071
1095 if (pl->ob != NULL) 1072 if (pl->ob != NULL)
1096 { 1073 {
1097 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);
… …
1107 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);
1108 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);
1109 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);
1110 } 1087 }
1111 1088
1112 if (pl->socket.exp64) 1089 if (pl->socket->exp64)
1113 { 1090 {
1114 uint8 s; 1091 uint8 s;
1115 1092
1116 for (s = 0; s < NUM_SKILLS; s++) 1093 for (s = 0; s < NUM_SKILLS; s++)
1117 { 1094 {
… …
1127 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;
1128 } 1105 }
1129 } 1106 }
1130 } 1107 }
1131 1108
1132 if (pl->socket.exp64) 1109 if (pl->socket->exp64)
1133 { 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) }
1134 else 1111 else
1135 { 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) }
1136 1113
1137 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1114 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1150 if (pl->run_on) 1127 if (pl->run_on)
1151 flags |= SF_RUNON; 1128 flags |= SF_RUNON;
1152 1129
1153 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1130 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1154 1131
1155 if (pl->socket.sc_version < 1025) 1132 if (pl->socket->sc_version < 1025)
1156 { 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) }
1157 else 1134 else
1158 { 1135 {
1159 int i; 1136 int i;
1160 1137
… …
1166 1143
1167 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]);
1168 } 1145 }
1169 } 1146 }
1170 1147
1171 if (pl->socket.monitor_spells) 1148 if (pl->socket->monitor_spells)
1172 { 1149 {
1173 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);
1174 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);
1175 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);
1176 } 1153 }
1177 1154
1178 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 */
1179 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1156 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1180 set_title (pl->ob, buf); 1157 set_title (pl->ob, buf);
1181 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1158 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1182 1159
1183 /* Only send it away if we have some actual data */ 1160 /* Only send it away if we have some actual data */
1184 if (sl.len > 6) 1161 if (sl.length () > 6)
1185 { 1162 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} 1163}
1194 1164
1195/** 1165/**
1196 * 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.
1197 */ 1167 */
1198void 1168void
1199esrv_new_player (player *pl, uint32 weight) 1169esrv_new_player (player *pl, uint32 weight)
1200{ 1170{
1201 pl->last_weight = weight; 1171 pl->last_weight = weight;
1202 1172
1203 SockList sl (MAXSOCKBUF); 1173 packet sl;
1204 sl << "player "; 1174 sl << "player ";
1205 1175
1206 sl << uint32 (pl->ob->count) 1176 sl << uint32 (pl->ob->count)
1207 << uint32 (weight) 1177 << uint32 (weight)
1208 << uint32 (pl->ob->face->number) 1178 << uint32 (pl->ob->face->number)
1209 << data8 (pl->ob->name); 1179 << data8 (pl->ob->name);
1210 1180
1211 Send_With_Handling (&pl->socket, &sl); 1181 pl->socket->send_packet (sl);
1212 sl.free ();
1213 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1182 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1214} 1183}
1215 1184
1216/** 1185/**
1217 * Need to send an animation sequence to the client. 1186 * Need to send an animation sequence to the client.
… …
1219 * 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
1220 * 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
1221 * when the player logs in and picks stuff up. 1190 * when the player logs in and picks stuff up.
1222 */ 1191 */
1223void 1192void
1224esrv_send_animation (NewSocket * ns, short anim_num) 1193esrv_send_animation (client_socket * ns, short anim_num)
1225{ 1194{
1226 int i; 1195 int i;
1227 1196
1228 /* 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
1229 * 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
… …
1233 { 1202 {
1234 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);
1235 return; 1204 return;
1236 } 1205 }
1237 1206
1238 SockList sl (MAXSOCKBUF); 1207 packet sl;
1239 1208
1240 sl << "anim " 1209 sl << "anim "
1241 << uint16 (anim_num) 1210 << uint16 (anim_num)
1242 << uint16 (0); /* flags - not used right now */ 1211 << uint16 (0); /* flags - not used right now */
1243 1212
… …
1249 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))
1250 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1219 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1251 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1220 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1252 } 1221 }
1253 1222
1254 Send_With_Handling (ns, &sl); 1223 ns->send_packet (sl);
1255 sl.free ();
1256 1224
1257 ns->anims_sent[anim_num] = 1; 1225 ns->anims_sent[anim_num] = 1;
1258} 1226}
1259 1227
1260 1228
… …
1267/** 1235/**
1268 * 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
1269 * the face yet, we will also send it. 1237 * the face yet, we will also send it.
1270 */ 1238 */
1271static void 1239static void
1272esrv_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)
1273{ 1241{
1274 if (newmap->cells[x][y].count >= MAP_LAYERS) 1242 if (newmap->cells[x][y].count >= MAP_LAYERS)
1275 { 1243 {
1276 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);
1277 return; 1245 return;
… …
1297 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1265 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1298}; 1266};
1299 1267
1300/** Checkes if map cells have changed */ 1268/** Checkes if map cells have changed */
1301static int 1269static int
1302mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1270mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1303{ 1271{
1304 int k; 1272 int k;
1305 1273
1306 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)
1307 return 1; 1275 return 1;
… …
1320 * 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
1321 * 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
1322 * how many layers of data we should back. 1290 * how many layers of data we should back.
1323 */ 1291 */
1324static uint8 * 1292static uint8 *
1325compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1293compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1326{ 1294{
1327 int x, y, k; 1295 int x, y, k;
1328 int face; 1296 int face;
1329 unsigned char *fcur; 1297 unsigned char *fcur;
1330 struct MapLayer layers[MAP_LAYERS]; 1298 struct MapLayer layers[MAP_LAYERS];
… …
1390 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1358 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1391 } 1359 }
1392 return cur; 1360 return cur;
1393} 1361}
1394 1362
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 */ 1363/** Clears a map cell */
1429static void 1364static void
1430map_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)
1431{ 1366{
1432 cell->faces[0] = face0; 1367 cell->faces[0] = face0;
… …
1471 * 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
1472 * 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
1473 * sent, it returns zero. 1408 * sent, it returns zero.
1474 */ 1409 */
1475static int 1410static int
1476check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1411check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1477{ 1412{
1478 short face_num; 1413 short face_num;
1479 1414
1480 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1415 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1481 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;
1482 else 1417 else
1483 face_num = 0; 1418 face_num = 0;
1484 1419
1485 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1420 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1486 { 1421 {
1487 SockList_AddShort (&sl, face_num); 1422 sl << uint16 (face_num);
1488 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1423 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1489 esrv_send_face (&ns, face_num, 0); 1424 esrv_send_face (&ns, face_num, 0);
1490 1425
1491 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1426 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1492 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1427 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
… …
1515 * 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
1516 * actually match. 1451 * actually match.
1517 */ 1452 */
1518 1453
1519static int 1454static int
1520update_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)
1521{ 1456{
1522 object *ob, *head; 1457 object *ob, *head;
1523 uint16 face_num; 1458 uint16 face_num;
1524 int bx, by, i; 1459 int bx, by, i;
1525 1460
… …
1738 * 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
1739 * take. 1674 * take.
1740 */ 1675 */
1741 1676
1742static inline int 1677static inline int
1743update_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)
1744{ 1679{
1745 object *ob; 1680 object *ob;
1746 int smoothlevel; /* old face_num; */ 1681 int smoothlevel; /* old face_num; */
1747 1682
1748 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1683 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1782 * 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
1783 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1718 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1784 * available. 1719 * available.
1785 */ 1720 */
1786int 1721int
1787getExtendedMapInfoSize (NewSocket * ns) 1722getExtendedMapInfoSize (client_socket * ns)
1788{ 1723{
1789 int result = 0; 1724 int result = 0;
1790 1725
1791 if (ns->ext_mapinfos) 1726 if (ns->ext_mapinfos)
1792 { 1727 {
… …
1828 uint8 eentrysize; 1763 uint8 eentrysize;
1829 uint16 ewhatstart, ewhatflag; 1764 uint16 ewhatstart, ewhatflag;
1830 uint8 extendedinfos; 1765 uint8 extendedinfos;
1831 maptile *m; 1766 maptile *m;
1832 1767
1833 NewSocket &socket = pl->contr->socket; 1768 client_socket &socket = *pl->contr->socket;
1834 1769
1835 check_map_change (pl->contr); 1770 check_map_change (pl->contr);
1836 1771
1837 SockList sl (MAXSOCKBUF); 1772 packet sl;
1838 SockList esl (MAXSOCKBUF); 1773 packet esl;
1839 1774
1840 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1775 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1841 startlen = sl.len; 1776 startlen = sl.length ();
1842 1777
1843 /*Extendedmapinfo structure initialisation */ 1778 /*Extendedmapinfo structure initialisation */
1844 if (socket.ext_mapinfos) 1779 if (socket.ext_mapinfos)
1845 { 1780 {
1846 extendedinfos = EMI_NOREDRAW; 1781 extendedinfos = EMI_NOREDRAW;
1847 1782
1848 if (socket.EMI_smooth) 1783 if (socket.EMI_smooth)
1849 extendedinfos |= EMI_SMOOTH; 1784 extendedinfos |= EMI_SMOOTH;
1850 1785
1851 ewhatstart = esl.len; 1786 ewhatstart = esl.length ();
1852 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1787 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1853 could need to be taken away */ 1788 could need to be taken away */
1854 eentrysize = getExtendedMapInfoSize (&socket); 1789 eentrysize = getExtendedMapInfoSize (&socket);
1855 esl << "mapextended " 1790 esl << "mapextended "
1856 << uint8 (extendedinfos) 1791 << uint8 (extendedinfos)
1857 << uint8 (eentrysize); 1792 << uint8 (eentrysize);
1793
1858 estartlen = esl.len; 1794 estartlen = esl.length ();
1859 } 1795 }
1860 else 1796 else
1861 { 1797 {
1862 /* suppress compiler warnings */ 1798 /* suppress compiler warnings */
1863 ewhatstart = 0; 1799 ewhatstart = 0;
… …
1901 */ 1837 */
1902 if (ax >= socket.mapx || ay >= socket.mapy) 1838 if (ax >= socket.mapx || ay >= socket.mapy)
1903 { 1839 {
1904 int i, got_one; 1840 int i, got_one;
1905 1841
1906 oldlen = sl.len; 1842 oldlen = sl.length ();
1907 1843
1908 sl << uint16 (mask); 1844 sl << uint16 (mask);
1909 1845
1910 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1846 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1911 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1847 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1915 * actually need to send that - just the coordinates 1851 * actually need to send that - just the coordinates
1916 * with no faces tells the client to blank out the 1852 * with no faces tells the client to blank out the
1917 * space. 1853 * space.
1918 */ 1854 */
1919 got_one = 0; 1855 got_one = 0;
1920 for (i = oldlen + 2; i < sl.len; i++) 1856 for (i = oldlen + 2; i < sl.length (); i++)
1921 if (sl.buf[i]) 1857 if (sl[i])
1922 got_one = 1; 1858 got_one = 1;
1923 1859
1924 if (got_one && (mask & 0xf)) 1860 if (got_one && (mask & 0xf))
1925 sl.buf[oldlen + 1] = mask & 0xff; 1861 sl[oldlen + 1] = mask & 0xff;
1926 else 1862 else
1927 { /*either all faces blank, either no face at all */ 1863 { /*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 */ 1864 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1929 sl.len = oldlen + 2; 1865 sl.reset (oldlen + 2);
1930 else 1866 else
1931 sl.len = oldlen; 1867 sl.reset (oldlen);
1932 } 1868 }
1933 1869
1934 /*What concerns extendinfos, nothing to be done for now 1870 /*What concerns extendinfos, nothing to be done for now
1935 * (perhaps effects layer later) 1871 * (perhaps effects layer later)
1936 */ 1872 */
… …
1966 1902
1967 /* This block deals with spaces that are not visible for whatever 1903 /* This block deals with spaces that are not visible for whatever
1968 * reason. Still may need to send the head for this space. 1904 * reason. Still may need to send the head for this space.
1969 */ 1905 */
1970 1906
1971 oldlen = sl.len; 1907 oldlen = sl.length ();
1972 1908
1973 sl << uint16 (mask); 1909 sl << uint16 (mask);
1974 1910
1975 if (lastcell.count != -1) 1911 if (lastcell.count != -1)
1976 need_send = 1; 1912 need_send = 1;
… …
1996 1932
1997 map_clearcell (&lastcell, 0, 0, 0, count); 1933 map_clearcell (&lastcell, 0, 0, 0, count);
1998 } 1934 }
1999 1935
2000 if ((mask & 0xf) || need_send) 1936 if ((mask & 0xf) || need_send)
2001 sl.buf[oldlen + 1] = mask & 0xff; 1937 sl[oldlen + 1] = mask & 0xff;
2002 else 1938 else
2003 sl.len = oldlen; 1939 sl.reset (oldlen);
2004 } 1940 }
2005 else 1941 else
2006 { 1942 {
2007 /* 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
2008 * we need to send. 1944 * we need to send.
… …
2010 1946
2011 /* Rather than try to figure out what everything that we might 1947 /* Rather than try to figure out what everything that we might
2012 * need to send is, then form the packet after that, 1948 * need to send is, then form the packet after that,
2013 * 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
2014 * 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,
2015 * 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
2016 * is done. 1952 * is done.
2017 * 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
2018 * what if anything we need to send, setting the bits, then 1954 * what if anything we need to send, setting the bits, then
2019 * doing those checks again to add the real data. 1955 * doing those checks again to add the real data.
2020 */ 1956 */
2021 oldlen = sl.len; 1957 oldlen = sl.length ();
2022 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1958 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2023 eoldlen = esl.len; 1959 eoldlen = esl.length ();
2024 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1960 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2025 sl << uint16 (mask); 1961 sl << uint16 (mask);
2026 1962
2027 if (socket.ext_mapinfos) 1963 if (socket.ext_mapinfos)
2028 esl << uint16 (emask); 1964 esl << uint16 (emask);
… …
2036 mask |= 0x8; 1972 mask |= 0x8;
2037 1973
2038 if (socket.extmap) 1974 if (socket.extmap)
2039 { 1975 {
2040 *last_ext |= 0x80; 1976 *last_ext |= 0x80;
2041 last_ext = sl.buf + sl.len; 1977 last_ext = &sl[sl.length ()];
2042 sl << uint8 (d); 1978 sl << uint8 (d);
2043 } 1979 }
2044 else 1980 else
2045 sl << uint8 (255 - 64 * d); 1981 sl << uint8 (255 - 64 * d);
2046 } 1982 }
… …
2080 { 2016 {
2081 lastcell.stat_hp = stat_hp; 2017 lastcell.stat_hp = stat_hp;
2082 2018
2083 mask |= 0x8; 2019 mask |= 0x8;
2084 *last_ext |= 0x80; 2020 *last_ext |= 0x80;
2085 last_ext = sl.buf + sl.len; 2021 last_ext = &sl[sl.length ()];
2086 2022
2087 sl << uint8 (5) << uint8 (stat_hp); 2023 sl << uint8 (5) << uint8 (stat_hp);
2088 2024
2089 if (stat_width > 1) 2025 if (stat_width > 1)
2090 { 2026 {
2091 *last_ext |= 0x80; 2027 *last_ext |= 0x80;
2092 last_ext = sl.buf + sl.len; 2028 last_ext = &sl[sl.length ()];
2093 2029
2094 sl << uint8 (6) << uint8 (stat_width); 2030 sl << uint8 (6) << uint8 (stat_width);
2095 } 2031 }
2096 } 2032 }
2097 2033
… …
2099 { 2035 {
2100 lastcell.player = player; 2036 lastcell.player = player;
2101 2037
2102 mask |= 0x8; 2038 mask |= 0x8;
2103 *last_ext |= 0x80; 2039 *last_ext |= 0x80;
2104 last_ext = sl.buf + sl.len; 2040 last_ext = &sl[sl.length ()];
2105 2041
2106 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 2042 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2107 } 2043 }
2108 2044
2109 if (lastcell.flags != flags) 2045 if (lastcell.flags != flags)
2110 { 2046 {
2111 lastcell.flags = flags; 2047 lastcell.flags = flags;
2112 2048
2113 mask |= 0x8; 2049 mask |= 0x8;
2114 *last_ext |= 0x80; 2050 *last_ext |= 0x80;
2115 last_ext = sl.buf + sl.len; 2051 last_ext = &sl[sl.length ()];
2116 2052
2117 sl << uint8 (8) << uint8 (flags); 2053 sl << uint8 (8) << uint8 (flags);
2118 } 2054 }
2119 } 2055 }
2120 2056
… …
2162 * space by checking the mask. If so, update the mask. 2098 * space by checking the mask. If so, update the mask.
2163 * 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
2164 * value, so we don't send those bits. 2100 * value, so we don't send those bits.
2165 */ 2101 */
2166 if (mask & 0xf) 2102 if (mask & 0xf)
2167 sl.buf[oldlen + 1] = mask & 0xff; 2103 sl[oldlen + 1] = mask & 0xff;
2168 else 2104 else
2169 sl.len = oldlen; 2105 sl.reset (oldlen);
2170 2106
2171 if (emask & 0xf) 2107 if (emask & 0xf)
2172 esl.buf[eoldlen + 1] = emask & 0xff; 2108 esl[eoldlen + 1] = emask & 0xff;
2173 else 2109 else
2174 esl.len = eoldlen; 2110 esl.reset (eoldlen);
2175 } /* else this is a viewable space */ 2111 } /* else this is a viewable space */
2176 } /* for x loop */ 2112 } /* for x loop */
2177 } /* for y loop */ 2113 } /* for y loop */
2178 2114
2179 /* Verify that we in fact do need to send this */ 2115 /* Verify that we in fact do need to send this */
2180 if (socket.ext_mapinfos) 2116 if (socket.ext_mapinfos)
2181 { 2117 {
2182 if (!(sl.len > startlen || socket.sent_scroll)) 2118 if (!(sl.length () > startlen || socket.sent_scroll))
2183 { 2119 {
2184 /* No map data will follow, so don't say the client 2120 /* No map data will follow, so don't say the client
2185 * it doesn't need draw! 2121 * it doesn't need draw!
2186 */ 2122 */
2187 ewhatflag &= (~EMI_NOREDRAW); 2123 ewhatflag &= (~EMI_NOREDRAW);
2188 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2124 esl[ewhatstart + 1] = ewhatflag & 0xff;
2189 } 2125 }
2190 2126
2191 if (esl.len > estartlen) 2127 if (esl.length () > estartlen)
2192 Send_With_Handling (&socket, &esl); 2128 socket.send_packet (esl);
2193 } 2129 }
2194 2130
2195 if (sl.len > startlen || socket.sent_scroll) 2131 if (sl.length () > startlen || socket.sent_scroll)
2196 { 2132 {
2197 Send_With_Handling (&socket, &sl); 2133 socket.send_packet (sl);
2198 socket.sent_scroll = 0; 2134 socket.sent_scroll = 0;
2199 } 2135 }
2200
2201 sl.free ();
2202 esl.free ();
2203} 2136}
2204 2137
2205/** 2138/**
2206 * Draws client map. 2139 * Draws client map.
2207 */ 2140 */
… …
2231 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2164 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2232 return; 2165 return;
2233 2166
2234 memset (&newmap, 0, sizeof (struct Map)); 2167 memset (&newmap, 0, sizeof (struct Map));
2235 2168
2236 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++)
2237 { 2170 {
2238 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++)
2239 { 2172 {
2240 ax = i; 2173 ax = i;
2241 ay = j; 2174 ay = j;
2242 m = pm; 2175 m = pm;
2243 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2176 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2258 { 2191 {
2259 update_los (pl); 2192 update_los (pl);
2260 pl->contr->do_los = 0; 2193 pl->contr->do_los = 0;
2261 } 2194 }
2262 2195
2263 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2264 {
2265 /* Big maps need a different drawing mechanism to work */ 2196 /* Big maps need a different drawing mechanism to work */
2266 draw_client_map1 (pl); 2197 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} 2198}
2331 2199
2332 2200
2333/*****************************************************************************/ 2201/*****************************************************************************/
2334 2202
… …
2340 2208
2341/*****************************************************************************/ 2209/*****************************************************************************/
2342void 2210void
2343send_plugin_custom_message (object *pl, char *buf) 2211send_plugin_custom_message (object *pl, char *buf)
2344{ 2212{
2345 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2213 pl->contr->socket->send_packet (buf);
2346} 2214}
2347 2215
2348/** 2216/**
2349 * This sends the skill number to name mapping. We ignore 2217 * This sends the skill number to name mapping. We ignore
2350 * the params - we always send the same info no matter what. 2218 * the params - we always send the same info no matter what.
2351 */ 2219 */
2352void 2220void
2353send_skill_info (NewSocket *ns, char *params) 2221send_skill_info (client_socket *ns, char *params)
2354{ 2222{
2355 SockList sl (MAXSOCKBUF); 2223 packet sl;
2356 sl << "replyinfo skill_info\n"; 2224 sl << "replyinfo skill_info\n";
2357 2225
2358 for (int i = 1; i < NUM_SKILLS; i++) 2226 for (int i = 1; i < NUM_SKILLS; i++)
2359 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2227 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2360 2228
2361 if (sl.len >= MAXSOCKBUF) 2229 if (sl.length () >= MAXSOCKBUF)
2362 { 2230 {
2363 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2231 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2364 fatal (0); 2232 fatal (0);
2365 } 2233 }
2366 2234
2367 Send_With_Handling (ns, &sl); 2235 ns->send_packet (sl);
2368 sl.free ();
2369} 2236}
2370 2237
2371/** 2238/**
2372 * This sends the spell path to name mapping. We ignore 2239 * This sends the spell path to name mapping. We ignore
2373 * the params - we always send the same info no matter what. 2240 * the params - we always send the same info no matter what.
2374 */ 2241 */
2375void 2242void
2376send_spell_paths (NewSocket * ns, char *params) 2243send_spell_paths (client_socket * ns, char *params)
2377{ 2244{
2378 SockList sl (MAXSOCKBUF); 2245 packet sl;
2379 2246
2380 sl << "replyinfo spell_paths\n"; 2247 sl << "replyinfo spell_paths\n";
2381 2248
2382 for (int i = 0; i < NRSPELLPATHS; i++) 2249 for (int i = 0; i < NRSPELLPATHS; i++)
2383 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2250 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2384 2251
2385 if (sl.len >= MAXSOCKBUF) 2252 if (sl.length () >= MAXSOCKBUF)
2386 { 2253 {
2387 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2254 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2388 fatal (0); 2255 fatal (0);
2389 } 2256 }
2390 2257
2391 Send_With_Handling (ns, &sl); 2258 ns->send_packet (sl);
2392 sl.free ();
2393} 2259}
2394 2260
2395/** 2261/**
2396 * 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.
2397 * 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
2398 */ 2264 */
2399void 2265void
2400esrv_update_spells (player *pl) 2266esrv_update_spells (player *pl)
2401{ 2267{
2402 if (!pl->socket.monitor_spells) 2268 if (!pl->socket->monitor_spells)
2403 return; 2269 return;
2404 2270
2405 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2271 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2406 { 2272 {
2407 if (spell->type == SPELL) 2273 if (spell->type == SPELL)
… …
2427 flags |= UPD_SP_DAMAGE; 2293 flags |= UPD_SP_DAMAGE;
2428 } 2294 }
2429 2295
2430 if (flags) 2296 if (flags)
2431 { 2297 {
2432 SockList sl (MAXSOCKBUF); 2298 packet sl;
2433 2299
2434 sl << "updspell " 2300 sl << "updspell "
2435 << uint8 (flags) 2301 << uint8 (flags)
2436 << uint32 (spell->count); 2302 << uint32 (spell->count);
2437 2303
2438 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2304 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2439 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2305 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2440 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2306 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2441 2307
2442 Send_With_Handling (&pl->socket, &sl); 2308 pl->socket->send_packet (sl);
2443 sl.free ();
2444 } 2309 }
2445 } 2310 }
2446 } 2311 }
2447} 2312}
2448 2313
2449void 2314void
2450esrv_remove_spell (player *pl, object *spell) 2315esrv_remove_spell (player *pl, object *spell)
2451{ 2316{
2452 if (!pl->socket.monitor_spells) 2317 if (!pl->socket->monitor_spells)
2453 return; 2318 return;
2454 2319
2455 if (!pl || !spell || spell->env != pl->ob) 2320 if (!pl || !spell || spell->env != pl->ob)
2456 { 2321 {
2457 LOG (llevError, "Invalid call to esrv_remove_spell"); 2322 LOG (llevError, "Invalid call to esrv_remove_spell");
2458 return; 2323 return;
2459 } 2324 }
2460 2325
2461 SockList sl (MAXSOCKBUF); 2326 packet sl;
2462 2327
2463 sl << "delspell " 2328 sl << "delspell "
2464 << uint32 (spell->count); 2329 << uint32 (spell->count);
2465 2330
2466 Send_With_Handling (&pl->socket, &sl); 2331 pl->socket->send_packet (sl);
2467 sl.free ();
2468} 2332}
2469 2333
2470/* 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. */
2471static void 2335static void
2472append_spell (player *pl, SockList &sl, object *spell) 2336append_spell (player *pl, packet &sl, object *spell)
2473{ 2337{
2474 int len, i, skill = 0; 2338 int len, i, skill = 0;
2475 2339
2476 if (!(spell->name)) 2340 if (!(spell->name))
2477 { 2341 {
… …
2520 { 2384 {
2521 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");
2522 return; 2386 return;
2523 } 2387 }
2524 2388
2525 if (!pl->socket.monitor_spells) 2389 if (!pl->socket->monitor_spells)
2526 return; 2390 return;
2527 2391
2528 SockList sl (MAXSOCKBUF); 2392 packet sl;
2529 2393
2530 sl << "addspell "; 2394 sl << "addspell ";
2531 2395
2532 if (!spell) 2396 if (!spell)
2533 { 2397 {
… …
2547 * like it will fix this 2411 * like it will fix this
2548 */ 2412 */
2549 if (spell->type != SPELL) 2413 if (spell->type != SPELL)
2550 continue; 2414 continue;
2551 2415
2552 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))))
2553 { 2417 {
2554 Send_With_Handling (&pl->socket, &sl); 2418 pl->socket->send_packet (sl);
2555 strcpy ((char *) sl.buf, "addspell "); 2419
2556 sl.len = strlen ((char *) sl.buf); 2420 sl.reset ();
2421 sl << "addspell ";
2557 } 2422 }
2558 2423
2559 append_spell (pl, sl, spell); 2424 append_spell (pl, sl, spell);
2560 } 2425 }
2561 } 2426 }
… …
2572 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2437 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2573 fatal (0); 2438 fatal (0);
2574 } 2439 }
2575 2440
2576 /* finally, we can send the packet */ 2441 /* finally, we can send the packet */
2577 Send_With_Handling (&pl->socket, &sl); 2442 pl->socket->send_packet (sl);
2578
2579 sl.free ();
2580} 2443}
2581 2444

Diff Legend

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