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

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

Diff Legend

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