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

Diff Legend

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