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.18 by root, Thu Sep 14 19:08:41 2006 UTC vs.
Revision 1.35 by root, Thu Dec 14 02:37:37 2006 UTC

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

Diff Legend

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