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.21 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.35 by root, Thu Dec 14 02:37:37 2006 UTC

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

Diff Legend

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