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.17 by root, Tue Sep 12 19:20:09 2006 UTC vs.
Revision 1.37 by root, Thu Dec 14 20:39:54 2006 UTC

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

Diff Legend

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