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.40 by root, Fri Dec 15 04:21:29 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;
… …
238 } 214 }
239 } 215 }
240 216
241 socket.current_x = ob->x; 217 socket.current_x = ob->x;
242 socket.current_y = ob->y; 218 socket.current_y = ob->y;
219}
220
221/**
222 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide
224 * that information.
225 */
226void
227RequestInfo (char *buf, int len, client_socket * ns)
228{
229 char *params = NULL, *cp;
230
231 /* No match */
232 char bigbuf[MAX_BUF];
233 int slen;
234
235 /* Set up replyinfo before we modify any of the buffers - this is used
236 * if we don't find a match.
237 */
238 strcpy (bigbuf, "replyinfo ");
239 slen = strlen (bigbuf);
240 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
241
242 /* find the first space, make it null, and update the
243 * params pointer.
244 */
245 for (cp = buf; *cp != '\0'; cp++)
246 if (*cp == ' ')
247 {
248 *cp = '\0';
249 params = cp + 1;
250 break;
251 }
252
253 if (!strcmp (buf, "image_info"))
254 send_image_info (ns, params);
255 else if (!strcmp (buf, "image_sums"))
256 send_image_sums (ns, params);
257 else if (!strcmp (buf, "skill_info"))
258 send_skill_info (ns, params);
259 else if (!strcmp (buf, "spell_paths"))
260 send_spell_paths (ns, params);
261 else
262 ns->send_packet (bigbuf, len);
243} 263}
244 264
245void 265void
246ExtCmd (char *buf, int len, player *pl) 266ExtCmd (char *buf, int len, player *pl)
247{ 267{
… …
266 if (!strncmp (buf, "spatial ", 8)) 286 if (!strncmp (buf, "spatial ", 8))
267 { 287 {
268 buf += 8; 288 buf += 8;
269 289
270 // initial map and its origin 290 // initial map and its origin
271 mapstruct *map = pl->ob->map; 291 maptile *map = pl->ob->map;
272 sint16 dx, dy; 292 sint16 dx, dy;
273 int mapx = pl->socket.mapx / 2 - pl->ob->x; 293 int mapx = pl->socket->mapx / 2 - pl->ob->x;
274 int mapy = pl->socket.mapy / 2 - pl->ob->y; 294 int mapy = pl->socket->mapy / 2 - pl->ob->y;
275 int max_distance = 8; // limit maximum path length to something generous 295 int max_distance = 8; // limit maximum path length to something generous
276 296
277 while (*buf && map && max_distance) 297 while (*buf && map && max_distance)
278 { 298 {
279 int dir = *buf++; 299 int dir = *buf++;
… …
330 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
331 } 351 }
332 else 352 else
333 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
334 354
335 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 355 pl->socket->send_packet (bigbuf);
336} 356}
337 357
338/** This is the Setup cmd - easy first implementation */ 358/** This is the Setup cmd - easy first implementation */
339void 359void
340SetUp (char *buf, int len, NewSocket * ns) 360SetUp (char *buf, int len, client_socket * ns)
341{ 361{
342 int s, slen; 362 int s, slen;
343 char *cmd, *param, cmdback[HUGE_BUF]; 363 char *cmd, *param, cmdback[HUGE_BUF];
344 364
345 /* run through the cmds of setup 365 /* run through the cmds of setup
… …
347 * 367 *
348 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 368 * 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 369 * The client then must sort this out
350 */ 370 */
351 371
352 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 372 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
373
353 strcpy (cmdback, "setup"); 374 strcpy (cmdback, "setup");
354 for (s = 0; s < len;) 375 for (s = 0; s < len; )
355 { 376 {
356
357 cmd = &buf[s]; 377 cmd = &buf[s];
358 378
359 /* find the next space, and put a null there */ 379 /* find the next space, and put a null there */
360 for (; buf[s] && buf[s] != ' '; s++); 380 for (; buf[s] && buf[s] != ' '; s++)
381 ;
382
361 buf[s++] = 0; 383 buf[s++] = 0;
384
362 while (buf[s] == ' ') 385 while (buf[s] == ' ')
363 s++; 386 s++;
364 387
365 if (s >= len) 388 if (s >= len)
366 break; 389 break;
367 390
368 param = &buf[s]; 391 param = &buf[s];
369 392
370 for (; buf[s] && buf[s] != ' '; s++); 393 for (; buf[s] && buf[s] != ' '; s++)
394 ;
395
371 buf[s++] = 0; 396 buf[s++] = 0;
397
372 while (buf[s] == ' ') 398 while (buf[s] == ' ')
373 s++; 399 s++;
374 400
375 slen = strlen (cmdback); 401 slen = strlen (cmdback);
376 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 402 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
537 * report a failure to the client. 563 * report a failure to the client.
538 */ 564 */
539 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 565 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
540 } 566 }
541 } /* for processing all the setup commands */ 567 } /* for processing all the setup commands */
568
542 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 569 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
543 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 570 ns->send_packet (cmdback);
544} 571}
545 572
546/** 573/**
547 * The client has requested to be added to the game. 574 * 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. 575 * 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, 576 * 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. 577 * it either has to be here or init_sockets needs to be exported.
551 */ 578 */
552void 579void
553AddMeCmd (char *buf, int len, NewSocket * ns) 580AddMeCmd (char *buf, int len, client_socket * ns)
554{ 581{
555 Settings oldsettings; 582 Settings oldsettings;
556 583
557 oldsettings = settings; 584 oldsettings = settings;
558 if (ns->status != Ns_Add || add_player (ns)) 585 if (ns->status != Ns_Add || add_player (ns))
559 { 586 ns->send_packet ("addme_failed");
560 Write_String_To_Socket (ns, "addme_failed", 12);
561 }
562 else 587 else
563 { 588 ns->send_packet ("addme_success");
564 /* Basically, the add_player copies the socket structure into 589
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; 590 settings = oldsettings;
574} 591}
575 592
576/** Reply to ExtendedInfos command */ 593/** Reply to ExtendedInfos command */
577void 594void
578ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 595ToggleExtendedInfos (char *buf, int len, client_socket * ns)
579{ 596{
580 char cmdback[MAX_BUF]; 597 char cmdback[MAX_BUF];
581 char command[50]; 598 char command[50];
582 int info, nextinfo; 599 int info, nextinfo;
583 600
… …
621 { 638 {
622 strcat (cmdback, " "); 639 strcat (cmdback, " ");
623 strcat (cmdback, "smoothing"); 640 strcat (cmdback, "smoothing");
624 } 641 }
625 642
626 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 643 ns->send_packet (cmdback);
627} 644}
628 645
629/* 646/*
630#define MSG_TYPE_BOOK 1 647#define MSG_TYPE_BOOK 1
631#define MSG_TYPE_CARD 2 648#define MSG_TYPE_CARD 2
… …
634#define MSG_TYPE_MONUMENT 5 651#define MSG_TYPE_MONUMENT 5
635#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 652#define MSG_TYPE_SCRIPTED_DIALOG 6*/
636 653
637/** Reply to ExtendedInfos command */ 654/** Reply to ExtendedInfos command */
638void 655void
639ToggleExtendedText (char *buf, int len, NewSocket * ns) 656ToggleExtendedText (char *buf, int len, client_socket * ns)
640{ 657{
641 char cmdback[MAX_BUF]; 658 char cmdback[MAX_BUF];
642 char temp[10]; 659 char temp[10];
643 char command[50]; 660 char command[50];
644 int info, nextinfo, i, flag; 661 int info, nextinfo, i, flag;
… …
684 strcat (cmdback, " "); 701 strcat (cmdback, " ");
685 snprintf (temp, sizeof (temp), "%d", i); 702 snprintf (temp, sizeof (temp), "%d", i);
686 strcat (cmdback, temp); 703 strcat (cmdback, temp);
687 } 704 }
688 705
689 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 706 ns->send_packet (cmdback);
690} 707}
691 708
692/** 709/**
693 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 710 * 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 711 * 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 712 * 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 713 * if we know the client wants it, might as well push it to the
697 * client. 714 * client.
698 */ 715 */
699static void 716static void
700SendSmooth (NewSocket * ns, uint16 face) 717SendSmooth (client_socket * ns, uint16 face)
701{ 718{
702 uint16 smoothface; 719 uint16 smoothface;
703 unsigned char reply[MAX_BUF];
704 SockList sl;
705 720
706 /* If we can't find a face, return and set it so we won't try to send this 721 /* If we can't find a face, return and set it so we won't try to send this
707 * again. 722 * again.
708 */ 723 */
709 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 724 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
717 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 732 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
718 esrv_send_face (ns, smoothface, 0); 733 esrv_send_face (ns, smoothface, 0);
719 734
720 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 735 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
721 736
722 sl.buf = reply; 737 packet sl;
723 strcpy ((char *) sl.buf, "smooth "); 738
724 sl.len = strlen ((char *) sl.buf); 739 sl << "smooth "
725 SockList_AddShort (&sl, face); 740 << uint16 (face)
726 SockList_AddShort (&sl, smoothface); 741 << uint16 (smoothface);
727 Send_With_Handling (ns, &sl); 742
743 ns->send_packet (sl);
728} 744}
729 745
730 /** 746 /**
731 * Tells client the picture it has to use 747 * Tells client the picture it has to use
732 * to smooth a picture number given as argument. 748 * to smooth a picture number given as argument.
733 */ 749 */
734void 750void
735AskSmooth (char *buf, int len, NewSocket * ns) 751AskSmooth (char *buf, int len, client_socket * ns)
736{ 752{
737 uint16 facenbr; 753 uint16 facenbr;
738 754
739 facenbr = atoi (buf); 755 facenbr = atoi (buf);
740 SendSmooth (ns, facenbr); 756 SendSmooth (ns, facenbr);
741} 757}
742
743
744
745
746 758
747/** 759/**
748 * This handles the general commands from the client (ie, north, fire, cast, 760 * This handles the general commands from the client (ie, north, fire, cast,
749 * etc.) 761 * etc.)
750 */ 762 */
… …
801 * etc.). It is a lot like PlayerCmd above, but is called with the 813 * etc.). It is a lot like PlayerCmd above, but is called with the
802 * 'ncom' method which gives more information back to the client so it 814 * 'ncom' method which gives more information back to the client so it
803 * can throttle. 815 * can throttle.
804 */ 816 */
805void 817void
806NewPlayerCmd (uint8 * buf, int len, player *pl) 818NewPlayerCmd (char *buf, int len, player *pl)
807{ 819{
808 int time, repeat; 820 int time, repeat;
809 short packet;
810 unsigned char command[MAX_BUF]; 821 char command[MAX_BUF];
811 SockList sl; 822 int pktlen;
812 823
813 if (len < 7) 824 if (len < 7)
814 { 825 {
815 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 826 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
816 return; 827 return;
817 } 828 }
818 829
819 packet = GetShort_String (buf); 830 pktlen = net_uint16 ((uint8 *)buf);
820 repeat = GetInt_String (buf + 2); 831 repeat = net_uint32 ((uint8 *)buf + 2);
832
821 /* -1 is special - no repeat, but don't update */ 833 /* -1 is special - no repeat, but don't update */
822 if (repeat != -1) 834 if (repeat != -1)
823 {
824 pl->count = repeat; 835 pl->count = repeat;
825 } 836
826 if ((len - 4) >= MAX_BUF) 837 if ((len - 4) >= MAX_BUF)
827 len = MAX_BUF - 5; 838 len = MAX_BUF - 5;
828 839
829 strncpy ((char *) command, (char *) buf + 6, len - 4); 840 strncpy ((char *) command, (char *) buf + 6, len - 4);
830 command[len - 4] = '\0'; 841 command[len - 4] = 0;
831
832 /* The following should never happen with a proper or honest client.
833 * Therefore, the error message doesn't have to be too clear - if
834 * someone is playing with a hacked/non working client, this gives them
835 * an idea of the problem, but they deserve what they get
836 */
837 if (pl->state != ST_PLAYING)
838 {
839 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
840 return;
841 }
842 842
843 /* This should not happen anymore. */ 843 /* This should not happen anymore. */
844 if (pl->ob->speed_left < -1.0) 844 if (pl->ob->speed_left < -1.0)
845 {
846 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 845 LOG (llevError, "Player has negative time - shouldn't do command.\n");
847 } 846
848 /* In c_new.c */ 847 /* In c_new.c */
849 execute_newserver_command (pl->ob, (char *) command); 848 execute_newserver_command (pl->ob, (char *) command);
850 /* Perhaps something better should be done with a left over count. 849 /* Perhaps something better should be done with a left over count.
851 * Cleaning up the input should probably be done first - all actions 850 * 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 851 * for the command that issued the count should be done before any other
853 * commands. 852 * commands.
854 */ 853 */
855 pl->count = 0; 854 pl->count = 0;
856 855
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) 856 if (FABS (pl->ob->speed) < 0.001)
863 time = MAX_TIME * 100; 857 time = MAX_TIME * 100;
864 else 858 else
865 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 859 time = (int) (MAX_TIME / FABS (pl->ob->speed));
866 SockList_AddInt (&sl, time); 860
867 Send_With_Handling (&pl->socket, &sl); 861 /* Send confirmation of command execution now */
862
863 packet sl;
864 sl << "comc " << uint16 (pktlen) << uint32 (time);
865 pl->socket->send_packet (sl);
868} 866}
869 867
870 868
871/** This is a reply to a previous query. */ 869/** This is a reply to a previous query. */
872void 870void
… …
939 * something older than the server. If we assume the client will be 937 * 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 938 * backwards compatible, having it be a later version should not be a
941 * problem. 939 * problem.
942 */ 940 */
943void 941void
944VersionCmd (char *buf, int len, NewSocket * ns) 942VersionCmd (char *buf, int len, client_socket * ns)
945{ 943{
946 char *cp; 944 char *cp;
947 char version_warning[256]; 945 char version_warning[256];
948 946
949 if (!buf) 947 if (!buf)
… …
984 /* these are old dxclients */ 982 /* these are old dxclients */
985 /* Version 1024 added support for singular + plural name values - 983 /* Version 1024 added support for singular + plural name values -
986 * requiing this minimal value reduces complexity of that code, and it 984 * requiing this minimal value reduces complexity of that code, and it
987 * has been around for a long time. 985 * has been around for a long time.
988 */ 986 */
989 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) 987 if (ns->sc_version < 1026)
990 { 988 {
991 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 989 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
992 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 990 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
993 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 991 ns->send_packet (version_warning);
994 } 992 }
995 993
996 } 994 }
997} 995}
998 996
999/** sound related functions. */ 997/** sound related functions. */
1000 998
1001void 999void
1002SetSound (char *buf, int len, NewSocket * ns) 1000SetSound (char *buf, int len, client_socket * ns)
1003{ 1001{
1004 ns->sound = atoi (buf); 1002 ns->sound = atoi (buf);
1005} 1003}
1006 1004
1007/** client wants the map resent */ 1005/** client wants the map resent */
… …
1017 */ 1015 */
1018#if 0 1016#if 0
1019 /* Okay, this is MAJOR UGLY. but the only way I know how to 1017 /* Okay, this is MAJOR UGLY. but the only way I know how to
1020 * clear the "cache" 1018 * clear the "cache"
1021 */ 1019 */
1022 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 1020 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1023 draw_client_map (pl->ob); 1021 draw_client_map (pl->ob);
1024#endif 1022#endif
1025} 1023}
1026 1024
1027/** 1025/**
… …
1065/** 1063/**
1066 * Asks the client to query the user. This way, the client knows 1064 * 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) 1065 * it needs to send something back (vs just printing out a message)
1068 */ 1066 */
1069void 1067void
1070send_query (NewSocket * ns, uint8 flags, char *text) 1068send_query (client_socket * ns, uint8 flags, char *text)
1071{ 1069{
1072 char buf[MAX_BUF]; 1070 char buf[MAX_BUF];
1073 1071
1074 sprintf (buf, "query %d %s", flags, text ? text : ""); 1072 sprintf (buf, "query %d %s", flags, text ? text : "");
1075 Write_String_To_Socket (ns, buf, strlen (buf)); 1073 ns->send_packet (buf);
1076} 1074}
1077 1075
1078#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1076#define AddIfInt64(Old,New,Type) if (Old != New) {\
1079 Old = New; \ 1077 Old = New; \
1080 SockList_AddChar(&sl, Type); \ 1078 sl << uint8 (Type) << uint64 (New); \
1081 SockList_AddInt64(&sl, New); \
1082 } 1079 }
1083 1080
1084#define AddIfInt(Old,New,Type) if (Old != New) {\ 1081#define AddIfInt(Old,New,Type) if (Old != New) {\
1085 Old = New; \ 1082 Old = New; \
1086 SockList_AddChar(&sl, Type); \ 1083 sl << uint8 (Type) << uint32 (New); \
1087 SockList_AddInt(&sl, New); \
1088 } 1084 }
1089 1085
1090#define AddIfShort(Old,New,Type) if (Old != New) {\ 1086#define AddIfShort(Old,New,Type) if (Old != New) {\
1091 Old = New; \ 1087 Old = New; \
1092 SockList_AddChar(&sl, Type); \ 1088 sl << uint8 (Type) << uint16 (New); \
1093 SockList_AddShort(&sl, New); \
1094 } 1089 }
1095 1090
1096#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1091#define AddIfFloat(Old,New,Type) if (Old != New) {\
1097 Old = New; \ 1092 Old = New; \
1098 SockList_AddChar(&sl, Type); \ 1093 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1099 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1100 } 1094 }
1101 1095
1102#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1096#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1103 if (Old) free(Old);\
1104 Old = strdup_local(New);\ 1097 free(Old); Old = strdup (New);\
1105 SockList_AddChar(&sl, Type); \ 1098 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 } 1099 }
1110 1100
1111/** 1101/**
1112 * Sends a statistics update. We look at the old values, 1102 * Sends a statistics update. We look at the old values,
1113 * and only send what has changed. Stat mapping values are in newclient.h 1103 * and only send what has changed. Stat mapping values are in newclient.h
… …
1115 * commands for now. 1105 * commands for now.
1116 */ 1106 */
1117void 1107void
1118esrv_update_stats (player *pl) 1108esrv_update_stats (player *pl)
1119{ 1109{
1120 SockList sl;
1121 char buf[MAX_BUF]; 1110 char buf[MAX_BUF];
1122 uint16 flags; 1111 uint16 flags;
1123 1112
1124 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1113 packet sl;
1125 strcpy ((char *) sl.buf, "stats "); 1114 sl << "stats ";
1126 sl.len = strlen ((char *) sl.buf);
1127 1115
1128 if (pl->ob != NULL) 1116 if (pl->ob != NULL)
1129 { 1117 {
1130 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1118 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); 1119 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); 1127 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); 1128 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); 1129 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); 1130 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1143 } 1131 }
1132
1144 if (pl->socket.exp64) 1133 if (pl->socket->exp64)
1145 { 1134 {
1146 uint8 s; 1135 uint8 s;
1147 1136
1148 for (s = 0; s < NUM_SKILLS; s++) 1137 for (s = 0; s < NUM_SKILLS; s++)
1149 { 1138 {
1150 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1139 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1151 { 1140 {
1152
1153 /* Always send along the level if exp changes. This is only 1141 /* Always send along the level if exp changes. This is only
1154 * 1 extra byte, but keeps processing simpler. 1142 * 1 extra byte, but keeps processing simpler.
1155 */ 1143 */
1156 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1144 sl << uint8 (s + CS_STAT_SKILLINFO)
1157 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1145 << uint8 (pl->last_skill_ob[s]->level)
1158 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1146 << uint64 (pl->last_skill_ob[s]->stats.exp);
1147
1159 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1148 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1160 } 1149 }
1161 } 1150 }
1162 } 1151 }
1152
1163 if (pl->socket.exp64) 1153 if (pl->socket->exp64)
1164 {
1165 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1154 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1166 }
1167 else 1155 else
1168 {
1169 AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP); 1156 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1170 } 1157
1171 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1158 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1172 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1159 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); 1160 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); 1161 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1175 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1162 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1176 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1163 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); 1164 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); 1165 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1179 flags = 0; 1166 flags = 0;
1167
1180 if (pl->fire_on) 1168 if (pl->fire_on)
1181 flags |= SF_FIREON; 1169 flags |= SF_FIREON;
1170
1182 if (pl->run_on) 1171 if (pl->run_on)
1183 flags |= SF_RUNON; 1172 flags |= SF_RUNON;
1184 1173
1185 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1174 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1175
1186 if (pl->socket.sc_version < 1025) 1176 if (pl->socket->sc_version < 1025)
1187 {
1188 AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1177 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1189 }
1190 else 1178 else
1191 { 1179 {
1192 int i; 1180 int i;
1193 1181
1194 for (i = 0; i < NROFATTACKS; i++) 1182 for (i = 0; i < NROFATTACKS; i++)
1195 { 1183 {
1196 /* Skip ones we won't send */ 1184 /* Skip ones we won't send */
1197 if (atnr_cs_stat[i] == -1) 1185 if (atnr_cs_stat[i] == -1)
1198 continue; 1186 continue;
1187
1199 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1188 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1200 } 1189 }
1201 } 1190 }
1191
1202 if (pl->socket.monitor_spells) 1192 if (pl->socket->monitor_spells)
1203 { 1193 {
1204 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1194 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); 1195 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); 1196 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1207 } 1197 }
1198
1208 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1199 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); 1200 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1210 set_title (pl->ob, buf); 1201 set_title (pl->ob, buf);
1211 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1202 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1212 1203
1213 /* Only send it away if we have some actual data */ 1204 /* Only send it away if we have some actual data */
1214 if (sl.len > 6) 1205 if (sl.length () > 6)
1215 { 1206 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} 1207}
1223
1224 1208
1225/** 1209/**
1226 * Tells the client that here is a player it should start using. 1210 * Tells the client that here is a player it should start using.
1227 */ 1211 */
1228void 1212void
1229esrv_new_player (player *pl, uint32 weight) 1213esrv_new_player (player *pl, uint32 weight)
1230{ 1214{
1231 SockList sl;
1232
1233 pl->last_weight = weight; 1215 pl->last_weight = weight;
1234 1216
1235 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1217 packet sl;
1218 sl << "player ";
1236 1219
1237 strcpy ((char *) sl.buf, "player "); 1220 sl << uint32 (pl->ob->count)
1238 sl.len = strlen ((char *) sl.buf); 1221 << uint32 (weight)
1239 SockList_AddInt (&sl, pl->ob->count); 1222 << uint32 (pl->ob->face->number)
1240 SockList_AddInt (&sl, weight); 1223 << data8 (pl->ob->name);
1241 SockList_AddInt (&sl, pl->ob->face->number);
1242 1224
1243 SockList_AddChar (&sl, (char) strlen (pl->ob->name)); 1225 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); 1226 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1250} 1227}
1251
1252 1228
1253/** 1229/**
1254 * Need to send an animation sequence to the client. 1230 * Need to send an animation sequence to the client.
1255 * We will send appropriate face commands to the client if we haven't 1231 * 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 1232 * 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 1233 * how much we are sending - on the other hand, this should only happen
1258 * when the player logs in and picks stuff up. 1234 * when the player logs in and picks stuff up.
1259 */ 1235 */
1260void 1236void
1261esrv_send_animation (NewSocket * ns, short anim_num) 1237esrv_send_animation (client_socket * ns, short anim_num)
1262{ 1238{
1263 SockList sl;
1264 int i; 1239 int i;
1265 1240
1266 /* Do some checking on the anim_num we got. Note that the animations 1241 /* 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 1242 * are added in contigous order, so if the number is in the valid
1268 * range, it must be a valid animation. 1243 * range, it must be a valid animation.
… …
1271 { 1246 {
1272 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1247 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1273 return; 1248 return;
1274 } 1249 }
1275 1250
1276 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1251 packet sl;
1277 strcpy ((char *) sl.buf, "anim "); 1252
1278 sl.len = 5; 1253 sl << "anim "
1279 SockList_AddShort (&sl, anim_num); 1254 << uint16 (anim_num)
1280 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1255 << uint16 (0); /* flags - not used right now */
1256
1281 /* Build up the list of faces. Also, send any information (ie, the 1257 /* Build up the list of faces. Also, send any information (ie, the
1282 * the face itself) down to the client. 1258 * the face itself) down to the client.
1283 */ 1259 */
1284 for (i = 0; i < animations[anim_num].num_animations; i++) 1260 for (i = 0; i < animations[anim_num].num_animations; i++)
1285 { 1261 {
1286 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1262 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1287 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1263 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1288 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1264 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1289 } 1265 }
1290 Send_With_Handling (ns, &sl); 1266
1291 free (sl.buf); 1267 ns->send_packet (sl);
1268
1292 ns->anims_sent[anim_num] = 1; 1269 ns->anims_sent[anim_num] = 1;
1293} 1270}
1294 1271
1295 1272
1296/****************************************************************************** 1273/******************************************************************************
… …
1302/** 1279/**
1303 * This adds face_num to a map cell at x,y. If the client doesn't have 1280 * 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. 1281 * the face yet, we will also send it.
1305 */ 1282 */
1306static void 1283static void
1307esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1284esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1308{ 1285{
1309 if (newmap->cells[x][y].count >= MAP_LAYERS) 1286 if (newmap->cells[x][y].count >= MAP_LAYERS)
1310 { 1287 {
1311 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1288 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1312 return; 1289 return;
1313 abort (); 1290 abort ();
1314 } 1291 }
1292
1315 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1293 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1316 newmap->cells[x][y].count++; 1294 newmap->cells[x][y].count++;
1295
1317 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1296 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1318 esrv_send_face (ns, face_num, 0); 1297 esrv_send_face (ns, face_num, 0);
1319} 1298}
1320 1299
1321struct LayerCell 1300struct LayerCell
… …
1330 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1309 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1331}; 1310};
1332 1311
1333/** Checkes if map cells have changed */ 1312/** Checkes if map cells have changed */
1334static int 1313static int
1335mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1314mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1336{ 1315{
1337 int k; 1316 int k;
1338 1317
1339 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1318 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1340 return 1; 1319 return 1;
… …
1353 * cnum is the client number, cur is the the buffer we put all of 1332 * 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 1333 * this data into. we return the end of the data. layers is
1355 * how many layers of data we should back. 1334 * how many layers of data we should back.
1356 */ 1335 */
1357static uint8 * 1336static uint8 *
1358compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1337compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1359{ 1338{
1360 int x, y, k; 1339 int x, y, k;
1361 int face; 1340 int face;
1362 unsigned char *fcur; 1341 unsigned char *fcur;
1363 struct MapLayer layers[MAP_LAYERS]; 1342 struct MapLayer layers[MAP_LAYERS];
… …
1423 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1402 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1424 } 1403 }
1425 return cur; 1404 return cur;
1426} 1405}
1427 1406
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 */ 1407/** Clears a map cell */
1465static void 1408static void
1466map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1409map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1467{ 1410{
1468 cell->faces[0] = face0; 1411 cell->faces[0] = face0;
1469 cell->faces[1] = face1; 1412 cell->faces[1] = face1;
1470 cell->faces[2] = face2; 1413 cell->faces[2] = face2;
1471 cell->count = count; 1414 cell->count = count;
1472 cell->stat_hp = 0; 1415 cell->stat_hp = 0;
1416 cell->flags = 0;
1473 cell->player = 0; 1417 cell->player = 0;
1474} 1418}
1475 1419
1476#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1420#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1477#define MAX_LAYERS 3 1421#define MAX_LAYERS 3
1478 1422
… …
1506 * needs to get sent - if so, it adds the data, sending the head 1450 * 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 1451 * if needed, and returning 1. If this no data needs to get
1508 * sent, it returns zero. 1452 * sent, it returns zero.
1509 */ 1453 */
1510static int 1454static int
1511check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1455check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1512{ 1456{
1513 short face_num; 1457 short face_num;
1514 1458
1515 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1459 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1516 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1460 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1517 else 1461 else
1518 face_num = 0; 1462 face_num = 0;
1519 1463
1520 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1464 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1521 { 1465 {
1522 SockList_AddShort (&sl, face_num); 1466 sl << uint16 (face_num);
1523 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1467 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1524 esrv_send_face (&ns, face_num, 0); 1468 esrv_send_face (&ns, face_num, 0);
1469
1525 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1470 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1526 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1471 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1527 return 1; 1472 return 1;
1528 } 1473 }
1529 1474
… …
1549 * the case, it seems to make more sense to have these layer values 1494 * the case, it seems to make more sense to have these layer values
1550 * actually match. 1495 * actually match.
1551 */ 1496 */
1552 1497
1553static int 1498static int
1554update_space (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1499update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1555{ 1500{
1556 object *ob, *head; 1501 object *ob, *head;
1557 uint16 face_num; 1502 uint16 face_num;
1558 int bx, by, i; 1503 int bx, by, i;
1559 1504
1560 /* If there is a multipart object stored away, treat that as more important. 1505 /* If there is a multipart object stored away, treat that as more important.
1561 * If not, then do the normal processing. 1506 * If not, then do the normal processing.
1562 */ 1507 */
1563
1564 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1508 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1565 1509
1566 /* Check to see if this head is part of the set of objects 1510 /* Check to see if this head is part of the set of objects
1567 * we would normally send for this space. If so, then 1511 * we would normally send for this space. If so, then
1568 * don't use the head value. We need to do the check 1512 * don't use the head value. We need to do the check
… …
1733 1677
1734 /* Another hack - because of heads and whatnot, this face may match one 1678 /* 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 1679 * we already sent for a lower layer. In that case, don't send
1736 * this one. 1680 * this one.
1737 */ 1681 */
1738 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) 1682 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1739 {
1740 face_num = 0; 1683 face_num = 0;
1741 }
1742 1684
1743 /* We've gotten what face we want to use for the object. Now see if 1685 /* 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. 1686 * if it has changed since we last sent it to the client.
1745 */ 1687 */
1746 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1688 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1747 { 1689 {
1748 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1690 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1749 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1691 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1750 esrv_send_face (ns, face_num, 0); 1692 esrv_send_face (&ns, face_num, 0);
1751 SockList_AddShort (sl, face_num); 1693
1694 sl << uint16 (face_num);
1752 return 1; 1695 return 1;
1753 } 1696 }
1697
1754 /* Nothing changed */ 1698 /* Nothing changed */
1755 return 0; 1699 return 0;
1756} 1700}
1757 1701
1758/** 1702/**
… …
1773 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1717 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1774 * take. 1718 * take.
1775 */ 1719 */
1776 1720
1777static inline int 1721static inline int
1778update_smooth (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1722update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1779{ 1723{
1780 object *ob; 1724 object *ob;
1781 int smoothlevel; /* old face_num; */ 1725 int smoothlevel; /* old face_num; */
1782 1726
1783 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1727 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1788 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1732 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1789 smoothlevel = 0; 1733 smoothlevel = 0;
1790 else 1734 else
1791 { 1735 {
1792 smoothlevel = ob->smoothlevel; 1736 smoothlevel = ob->smoothlevel;
1793 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1737 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1794 SendSmooth (ns, ob->face->number); 1738 SendSmooth (&ns, ob->face->number);
1795 } /* else not already head object or blank face */ 1739 } /* else not already head object or blank face */
1796 1740
1797 /* We've gotten what face we want to use for the object. Now see if 1741 /* 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. 1742 * if it has changed since we last sent it to the client.
1799 */ 1743 */
1800 if (smoothlevel > 255) 1744 if (smoothlevel > 255)
1801 smoothlevel = 255; 1745 smoothlevel = 255;
1802 else if (smoothlevel < 0) 1746 else if (smoothlevel < 0)
1803 smoothlevel = 0; 1747 smoothlevel = 0;
1748
1804 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1749 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1805 { 1750 {
1806 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1751 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1807 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1752 sl << uint8 (smoothlevel);
1808 return 1; 1753 return 1;
1809 } 1754 }
1755
1810 /* Nothing changed */ 1756 /* Nothing changed */
1811 return 0; 1757 return 0;
1812} 1758}
1813 1759
1814/** 1760/**
1815 * Returns the size of a data for a map square as returned by 1761 * Returns the size of a data for a map square as returned by
1816 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1762 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1817 * available. 1763 * available.
1818 */ 1764 */
1819int 1765int
1820getExtendedMapInfoSize (NewSocket * ns) 1766getExtendedMapInfoSize (client_socket * ns)
1821{ 1767{
1822 int result = 0; 1768 int result = 0;
1823 1769
1824 if (ns->ext_mapinfos) 1770 if (ns->ext_mapinfos)
1825 { 1771 {
… …
1855draw_client_map1 (object *pl) 1801draw_client_map1 (object *pl)
1856{ 1802{
1857 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1803 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1858 sint16 nx, ny; 1804 sint16 nx, ny;
1859 int estartlen, eoldlen; 1805 int estartlen, eoldlen;
1860 SockList sl;
1861 SockList esl; /*For extended Map info */
1862 uint16 mask, emask; 1806 uint16 mask, emask;
1863 uint8 eentrysize; 1807 uint8 eentrysize;
1864 uint16 ewhatstart, ewhatflag; 1808 uint16 ewhatstart, ewhatflag;
1865 uint8 extendedinfos; 1809 uint8 extendedinfos;
1866 mapstruct *m; 1810 maptile *m;
1867 1811
1868 NewSocket & socket = pl->contr->socket; 1812 client_socket &socket = *pl->contr->socket;
1869 1813
1870 check_map_change (pl->contr); 1814 check_map_change (pl->contr);
1871 1815
1872 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1816 packet sl;
1873 if (socket.mapmode == Map1Cmd) 1817 packet esl;
1874 strcpy ((char *) sl.buf, "map1 "); 1818
1875 else 1819 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1876 strcpy ((char *) sl.buf, "map1a ");
1877 sl.len = strlen ((char *) sl.buf);
1878 startlen = sl.len; 1820 startlen = sl.length ();
1821
1879 /*Extendedmapinfo structure initialisation */ 1822 /*Extendedmapinfo structure initialisation */
1880 if (socket.ext_mapinfos) 1823 if (socket.ext_mapinfos)
1881 { 1824 {
1882 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1883 strcpy ((char *) esl.buf, "mapextended ");
1884 esl.len = strlen ((char *) esl.buf);
1885 extendedinfos = EMI_NOREDRAW; 1825 extendedinfos = EMI_NOREDRAW;
1826
1886 if (socket.EMI_smooth) 1827 if (socket.EMI_smooth)
1887 extendedinfos |= EMI_SMOOTH; 1828 extendedinfos |= EMI_SMOOTH;
1829
1888 ewhatstart = esl.len; 1830 ewhatstart = esl.length ();
1889 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1831 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1890 could need to be taken away */ 1832 could need to be taken away */
1891 SockList_AddChar (&esl, extendedinfos);
1892 eentrysize = getExtendedMapInfoSize (&socket); 1833 eentrysize = getExtendedMapInfoSize (&socket);
1893 SockList_AddChar (&esl, eentrysize); 1834 esl << "mapextended "
1835 << uint8 (extendedinfos)
1836 << uint8 (eentrysize);
1837
1894 estartlen = esl.len; 1838 estartlen = esl.length ();
1895 } 1839 }
1896 else 1840 else
1897 { 1841 {
1898 /* suppress compiler warnings */ 1842 /* suppress compiler warnings */
1899 ewhatstart = 0; 1843 ewhatstart = 0;
1900 ewhatflag = 0; 1844 ewhatflag = 0;
1901 estartlen = 0; 1845 estartlen = 0;
1902 } 1846 }
1847
1903 /* Init data to zero */ 1848 /* Init data to zero */
1904 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1849 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1905 1850
1906 /* x,y are the real map locations. ax, ay are viewport relative 1851 /* x,y are the real map locations. ax, ay are viewport relative
1907 * locations. 1852 * locations.
… …
1911 /* We could do this logic as conditionals in the if statement, 1856 /* We could do this logic as conditionals in the if statement,
1912 * but that started to get a bit messy to look at. 1857 * but that started to get a bit messy to look at.
1913 */ 1858 */
1914 max_x = pl->x + (socket.mapx + 1) / 2; 1859 max_x = pl->x + (socket.mapx + 1) / 2;
1915 max_y = pl->y + (socket.mapy + 1) / 2; 1860 max_y = pl->y + (socket.mapy + 1) / 2;
1861
1916 if (socket.mapmode == Map1aCmd) 1862 if (socket.mapmode == Map1aCmd)
1917 { 1863 {
1918 max_x += MAX_HEAD_OFFSET; 1864 max_x += MAX_HEAD_OFFSET;
1919 max_y += MAX_HEAD_OFFSET; 1865 max_y += MAX_HEAD_OFFSET;
1920 } 1866 }
… …
1935 */ 1881 */
1936 if (ax >= socket.mapx || ay >= socket.mapy) 1882 if (ax >= socket.mapx || ay >= socket.mapy)
1937 { 1883 {
1938 int i, got_one; 1884 int i, got_one;
1939 1885
1940 oldlen = sl.len; 1886 oldlen = sl.length ();
1941 1887
1942 SockList_AddShort (&sl, mask); 1888 sl << uint16 (mask);
1943 1889
1944 if (check_head (sl, socket, ax, ay, 2)) 1890 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1945 mask |= 0x4;
1946 if (check_head (sl, socket, ax, ay, 1)) 1891 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1947 mask |= 0x2;
1948 if (check_head (sl, socket, ax, ay, 0)) 1892 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1949 mask |= 0x1;
1950 1893
1951 /* If all we are doing is sending 0 (blank) faces, we don't 1894 /* If all we are doing is sending 0 (blank) faces, we don't
1952 * actually need to send that - just the coordinates 1895 * actually need to send that - just the coordinates
1953 * with no faces tells the client to blank out the 1896 * with no faces tells the client to blank out the
1954 * space. 1897 * space.
1955 */ 1898 */
1956 got_one = 0; 1899 got_one = 0;
1957 for (i = oldlen + 2; i < sl.len; i++) 1900 for (i = oldlen + 2; i < sl.length (); i++)
1958 {
1959 if (sl.buf[i]) 1901 if (sl[i])
1960 got_one = 1; 1902 got_one = 1;
1961 }
1962 1903
1963 if (got_one && (mask & 0xf)) 1904 if (got_one && (mask & 0xf))
1964 {
1965 sl.buf[oldlen + 1] = mask & 0xff; 1905 sl[oldlen + 1] = mask & 0xff;
1966 }
1967 else 1906 else
1968 { /*either all faces blank, either no face at all */ 1907 { /*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 */ 1908 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1970 sl.len = oldlen + 2; 1909 sl.reset (oldlen + 2);
1971 else 1910 else
1972 sl.len = oldlen; 1911 sl.reset (oldlen);
1973 } 1912 }
1913
1974 /*What concerns extendinfos, nothing to be done for now 1914 /*What concerns extendinfos, nothing to be done for now
1975 * (perhaps effects layer later) 1915 * (perhaps effects layer later)
1976 */ 1916 */
1977 continue; /* don't do processing below */ 1917 continue; /* don't do processing below */
1978 } 1918 }
1979 1919
1980 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1920 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1981 1921
1982 d = pl->contr->blocked_los[ax][ay]; 1922 d = pl->contr->blocked_los[ax][ay];
1983 1923
1984 /* If the coordinates are not valid, or it is too dark to see, 1924 /* If the coordinates are not valid, or it is too dark to see,
1985 * we tell the client as such 1925 * we tell the client as such
1986 */ 1926 */
1987 nx = x; 1927 nx = x;
1988 ny = y; 1928 ny = y;
1989 m = get_map_from_coord (pl->map, &nx, &ny); 1929 m = get_map_from_coord (pl->map, &nx, &ny);
1930
1990 if (!m) 1931 if (!m)
1991 { 1932 {
1992 /* space is out of map. Update space and clear values 1933 /* space is out of map. Update space and clear values
1993 * if this hasn't already been done. If the space is out 1934 * if this hasn't already been done. If the space is out
1994 * of the map, it shouldn't have a head 1935 * of the map, it shouldn't have a head
1995 */ 1936 */
1996 if (lastcell.count != -1) 1937 if (lastcell.count != -1)
1997 { 1938 {
1998 SockList_AddShort (&sl, mask); 1939 sl << uint16 (mask);
1999 map_clearcell (&lastcell, 0, 0, 0, -1); 1940 map_clearcell (&lastcell, 0, 0, 0, -1);
2000 } 1941 }
2001 } 1942 }
2002 else if (d > 3) 1943 else if (d > 3)
2003 { 1944 {
… …
2005 1946
2006 /* This block deals with spaces that are not visible for whatever 1947 /* This block deals with spaces that are not visible for whatever
2007 * reason. Still may need to send the head for this space. 1948 * reason. Still may need to send the head for this space.
2008 */ 1949 */
2009 1950
2010 oldlen = sl.len; 1951 oldlen = sl.length ();
2011 1952
2012 SockList_AddShort (&sl, mask); 1953 sl << uint16 (mask);
1954
2013 if (lastcell.count != -1) 1955 if (lastcell.count != -1)
2014 need_send = 1; 1956 need_send = 1;
1957
2015 count = -1; 1958 count = -1;
2016 1959
2017 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1960 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2018 { 1961 {
2019 /* Now check to see if any heads need to be sent */ 1962 /* Now check to see if any heads need to be sent */
2020 1963
2021 if (check_head (sl, socket, ax, ay, 2)) 1964 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2022 mask |= 0x4;
2023 if (check_head (sl, socket, ax, ay, 1)) 1965 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2024 mask |= 0x2;
2025 if (check_head (sl, socket, ax, ay, 0)) 1966 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2026 mask |= 0x1;
2027 1967
2028 lastcell.count = count; 1968 lastcell.count = count;
2029
2030 } 1969 }
2031 else 1970 else
2032 { 1971 {
2033 struct MapCell *cell = &lastcell;
2034
2035 /* properly clear a previously sent big face */ 1972 /* properly clear a previously sent big face */
2036 if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) 1973 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1974 || lastcell.stat_hp || lastcell.flags || lastcell.player)
2037 need_send = 1; 1975 need_send = 1;
1976
2038 map_clearcell (&lastcell, 0, 0, 0, count); 1977 map_clearcell (&lastcell, 0, 0, 0, count);
2039 } 1978 }
2040 1979
2041 if ((mask & 0xf) || need_send) 1980 if ((mask & 0xf) || need_send)
2042 {
2043 sl.buf[oldlen + 1] = mask & 0xff; 1981 sl[oldlen + 1] = mask & 0xff;
2044 }
2045 else 1982 else
2046 {
2047 sl.len = oldlen; 1983 sl.reset (oldlen);
2048 }
2049 } 1984 }
2050 else 1985 else
2051 { 1986 {
2052 /* In this block, the space is visible or there are head objects 1987 /* In this block, the space is visible or there are head objects
2053 * we need to send. 1988 * we need to send.
… …
2055 1990
2056 /* Rather than try to figure out what everything that we might 1991 /* Rather than try to figure out what everything that we might
2057 * need to send is, then form the packet after that, 1992 * need to send is, then form the packet after that,
2058 * we presume that we will in fact form a packet, and update 1993 * 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, 1994 * 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 1995 * we just back out sl.length () to the old value, and no harm
2061 * is done. 1996 * is done.
2062 * I think this is simpler than doing a bunch of checks to see 1997 * 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 1998 * what if anything we need to send, setting the bits, then
2064 * doing those checks again to add the real data. 1999 * doing those checks again to add the real data.
2065 */ 2000 */
2066 oldlen = sl.len; 2001 oldlen = sl.length ();
2067 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2002 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2068 eoldlen = esl.len; 2003 eoldlen = esl.length ();
2069 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2004 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2070 SockList_AddShort (&sl, mask); 2005 sl << uint16 (mask);
2071 2006
2072 if (socket.ext_mapinfos) 2007 if (socket.ext_mapinfos)
2073 SockList_AddShort (&esl, emask); 2008 esl << uint16 (emask);
2074 2009
2075 unsigned char dummy; 2010 unsigned char dummy;
2076 unsigned char *last_ext = &dummy; 2011 unsigned char *last_ext = &dummy;
2077 2012
2078 /* Darkness changed */ 2013 /* Darkness changed */
… …
2081 mask |= 0x8; 2016 mask |= 0x8;
2082 2017
2083 if (socket.extmap) 2018 if (socket.extmap)
2084 { 2019 {
2085 *last_ext |= 0x80; 2020 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 2021 last_ext = &sl[sl.length ()];
2087 SockList_AddChar (&sl, d); 2022 sl << uint8 (d);
2088 } 2023 }
2089 else 2024 else
2090 SockList_AddChar (&sl, 255 - 64 * d); 2025 sl << uint8 (255 - 64 * d);
2091 } 2026 }
2092 2027
2093 lastcell.count = d; 2028 lastcell.count = d;
2094 2029
2095 if (socket.extmap) 2030 if (socket.extmap)
2096 { 2031 {
2097 uint8 stat_hp = 0; 2032 uint8 stat_hp = 0;
2098 uint8 stat_width = 0; 2033 uint8 stat_width = 0;
2034 uint8 flags = 0;
2099 tag_t player = 0; 2035 UUID player = 0;
2100 2036
2101 // send hp information, if applicable 2037 // send hp information, if applicable
2102 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2038 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2103 { 2039 {
2104 if (op->head || op->invisible) 2040 if (op->head || op->invisible)
… …
2111 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 2047 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2112 stat_width = op->arch->tail_x; 2048 stat_width = op->arch->tail_x;
2113 } 2049 }
2114 } 2050 }
2115 2051
2052 if (op->msg && op->msg[0] == '@')
2053 flags |= 1;
2054
2116 if (op->type == PLAYER && op != pl) 2055 if (op->type == PLAYER && op != pl)
2117 player = op->count; 2056 player = op->count;
2118 } 2057 }
2119 2058
2120 if (lastcell.stat_hp != stat_hp) 2059 if (lastcell.stat_hp != stat_hp)
2121 { 2060 {
2122 lastcell.stat_hp = stat_hp; 2061 lastcell.stat_hp = stat_hp;
2123 2062
2124 mask |= 0x8; 2063 mask |= 0x8;
2125 *last_ext |= 0x80; 2064 *last_ext |= 0x80;
2126 last_ext = sl.buf + sl.len; 2065 last_ext = &sl[sl.length ()];
2127 SockList_AddChar (&sl, 5); 2066
2128 SockList_AddChar (&sl, stat_hp); 2067 sl << uint8 (5) << uint8 (stat_hp);
2129 2068
2130 if (stat_width > 1) 2069 if (stat_width > 1)
2131 { 2070 {
2132 *last_ext |= 0x80; 2071 *last_ext |= 0x80;
2133 last_ext = sl.buf + sl.len; 2072 last_ext = &sl[sl.length ()];
2134 SockList_AddChar (&sl, 6); 2073
2135 SockList_AddChar (&sl, stat_width); 2074 sl << uint8 (6) << uint8 (stat_width);
2136 } 2075 }
2137 } 2076 }
2138 2077
2139 if (lastcell.player !=player) 2078 if (lastcell.player != player)
2140 { 2079 {
2141 lastcell.player = player; 2080 lastcell.player = player;
2142 2081
2143 mask |= 0x8; 2082 mask |= 0x8;
2144 *last_ext |= 0x80; 2083 *last_ext |= 0x80;
2145 last_ext = sl.buf + sl.len; 2084 last_ext = &sl[sl.length ()];
2146 SockList_AddChar (&sl, 0x47); 2085
2147 SockList_AddChar (&sl, 4); 2086 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2148 SockList_AddInt (&sl, player); 2087 }
2088
2089 if (lastcell.flags != flags)
2090 {
2091 lastcell.flags = flags;
2092
2093 mask |= 0x8;
2094 *last_ext |= 0x80;
2095 last_ext = &sl[sl.length ()];
2096
2097 sl << uint8 (8) << uint8 (flags);
2149 } 2098 }
2150 } 2099 }
2151 2100
2152 /* Floor face */ 2101 /* Floor face */
2153 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 2102 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2154 mask |= 0x4; 2103 mask |= 0x4;
2155 2104
2156 if (socket.EMI_smooth) 2105 if (socket.EMI_smooth)
2157 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 2106 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2158 emask |= 0x4; 2107 emask |= 0x4;
2159 2108
2160 /* Middle face */ 2109 /* Middle face */
2161 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 2110 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2162 mask |= 0x2; 2111 mask |= 0x2;
2163 2112
2164 if (socket.EMI_smooth) 2113 if (socket.EMI_smooth)
2165 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 2114 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2166 emask |= 0x2; 2115 emask |= 0x2;
2167 2116
2168 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 2117 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2169 { 2118 {
2170 if (lastcell.faces[0] != pl->face->number) 2119 if (lastcell.faces[0] != pl->face->number)
2171 { 2120 {
2172 lastcell.faces[0] = pl->face->number; 2121 lastcell.faces[0] = pl->face->number;
2173 mask |= 0x1; 2122 mask |= 0x1;
2123
2174 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 2124 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2175 esrv_send_face (&socket, pl->face->number, 0); 2125 esrv_send_face (&socket, pl->face->number, 0);
2176 SockList_AddShort (&sl, pl->face->number); 2126
2127 sl << uint16 (pl->face->number);
2177 } 2128 }
2178 } 2129 }
2179 /* Top face */
2180 else 2130 else
2181 { 2131 {
2132 /* Top face */
2182 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 2133 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2183 mask |= 0x1; 2134 mask |= 0x1;
2135
2184 if (socket.EMI_smooth) 2136 if (socket.EMI_smooth)
2185 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 2137 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2186 {
2187 emask |= 0x1; 2138 emask |= 0x1;
2188 }
2189 } 2139 }
2140
2190 /* Check to see if we are in fact sending anything for this 2141 /* Check to see if we are in fact sending anything for this
2191 * space by checking the mask. If so, update the mask. 2142 * space by checking the mask. If so, update the mask.
2192 * if not, reset the len to that from before adding the mask 2143 * if not, reset the len to that from before adding the mask
2193 * value, so we don't send those bits. 2144 * value, so we don't send those bits.
2194 */ 2145 */
2195 if (mask & 0xf) 2146 if (mask & 0xf)
2196 {
2197 sl.buf[oldlen + 1] = mask & 0xff; 2147 sl[oldlen + 1] = mask & 0xff;
2198 }
2199 else 2148 else
2200 {
2201 sl.len = oldlen; 2149 sl.reset (oldlen);
2202 } 2150
2203 if (emask & 0xf) 2151 if (emask & 0xf)
2204 {
2205 esl.buf[eoldlen + 1] = emask & 0xff; 2152 esl[eoldlen + 1] = emask & 0xff;
2206 }
2207 else 2153 else
2208 {
2209 esl.len = eoldlen; 2154 esl.reset (eoldlen);
2210 }
2211 } /* else this is a viewable space */ 2155 } /* else this is a viewable space */
2212 } /* for x loop */ 2156 } /* for x loop */
2213 } /* for y loop */ 2157 } /* for y loop */
2214 2158
2215 /* Verify that we in fact do need to send this */ 2159 /* Verify that we in fact do need to send this */
2216 if (socket.ext_mapinfos) 2160 if (socket.ext_mapinfos)
2217 { 2161 {
2218 if (!(sl.len > startlen || socket.sent_scroll)) 2162 if (!(sl.length () > startlen || socket.sent_scroll))
2219 { 2163 {
2220 /* No map data will follow, so don't say the client 2164 /* No map data will follow, so don't say the client
2221 * it doesn't need draw! 2165 * it doesn't need draw!
2222 */ 2166 */
2223 ewhatflag &= (~EMI_NOREDRAW); 2167 ewhatflag &= (~EMI_NOREDRAW);
2224 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2168 esl[ewhatstart + 1] = ewhatflag & 0xff;
2225 } 2169 }
2170
2226 if (esl.len > estartlen) 2171 if (esl.length () > estartlen)
2227 { 2172 socket.send_packet (esl);
2228 Send_With_Handling (&socket, &esl);
2229 }
2230 free (esl.buf);
2231 } 2173 }
2174
2232 if (sl.len > startlen || socket.sent_scroll) 2175 if (sl.length () > startlen || socket.sent_scroll)
2233 { 2176 {
2234 Send_With_Handling (&socket, &sl); 2177 socket.send_packet (sl);
2235 socket.sent_scroll = 0; 2178 socket.sent_scroll = 0;
2236 } 2179 }
2237 free (sl.buf);
2238} 2180}
2239 2181
2240/** 2182/**
2241 * Draws client map. 2183 * Draws client map.
2242 */ 2184 */
… …
2247 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2189 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2248 New_Face *face, *floor; 2190 New_Face *face, *floor;
2249 New_Face *floor2; 2191 New_Face *floor2;
2250 int d, mflags; 2192 int d, mflags;
2251 struct Map newmap; 2193 struct Map newmap;
2252 mapstruct *m, *pm; 2194 maptile *m, *pm;
2253 2195
2254 if (pl->type != PLAYER) 2196 if (pl->type != PLAYER)
2255 { 2197 {
2256 LOG (llevError, "draw_client_map called with non player/non eric-server\n"); 2198 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2257 return; 2199 return;
… …
2266 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2208 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2267 return; 2209 return;
2268 2210
2269 memset (&newmap, 0, sizeof (struct Map)); 2211 memset (&newmap, 0, sizeof (struct Map));
2270 2212
2271 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2213 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2272 { 2214 {
2273 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2215 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2274 { 2216 {
2275 ax = i; 2217 ax = i;
2276 ay = j; 2218 ay = j;
2277 m = pm; 2219 m = pm;
2278 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2220 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2293 { 2235 {
2294 update_los (pl); 2236 update_los (pl);
2295 pl->contr->do_los = 0; 2237 pl->contr->do_los = 0;
2296 } 2238 }
2297 2239
2298 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2299 {
2300 /* Big maps need a different drawing mechanism to work */ 2240 /* Big maps need a different drawing mechanism to work */
2301 draw_client_map1 (pl); 2241 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} 2242}
2365 2243
2366 2244
2367/*****************************************************************************/ 2245/*****************************************************************************/
2368 2246
… …
2374 2252
2375/*****************************************************************************/ 2253/*****************************************************************************/
2376void 2254void
2377send_plugin_custom_message (object *pl, char *buf) 2255send_plugin_custom_message (object *pl, char *buf)
2378{ 2256{
2379 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2257 pl->contr->socket->send_packet (buf);
2380} 2258}
2381 2259
2382/** 2260/**
2383 * This sends the skill number to name mapping. We ignore 2261 * This sends the skill number to name mapping. We ignore
2384 * the params - we always send the same info no matter what. 2262 * the params - we always send the same info no matter what.
2385 */ 2263 */
2386void 2264void
2387send_skill_info (NewSocket * ns, char *params) 2265send_skill_info (client_socket *ns, char *params)
2388{ 2266{
2389 SockList sl; 2267 packet sl;
2390 int i; 2268 sl << "replyinfo skill_info\n";
2391 2269
2392 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2393 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2394 for (i = 1; i < NUM_SKILLS; i++) 2270 for (int i = 1; i < NUM_SKILLS; i++)
2395 { 2271 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]); 2272
2397 }
2398 sl.len = strlen ((char *) sl.buf);
2399 if (sl.len >= MAXSOCKBUF) 2273 if (sl.length () >= MAXSOCKBUF)
2400 { 2274 {
2401 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2275 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2402 fatal (0); 2276 fatal (0);
2403 } 2277 }
2404 Send_With_Handling (ns, &sl); 2278
2405 free (sl.buf); 2279 ns->send_packet (sl);
2406} 2280}
2407 2281
2408/** 2282/**
2409 * This sends the spell path to name mapping. We ignore 2283 * This sends the spell path to name mapping. We ignore
2410 * the params - we always send the same info no matter what. 2284 * the params - we always send the same info no matter what.
2411 */ 2285 */
2412void 2286void
2413send_spell_paths (NewSocket * ns, char *params) 2287send_spell_paths (client_socket * ns, char *params)
2414{ 2288{
2415 SockList sl; 2289 packet sl;
2416 int i;
2417 2290
2418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2291 sl << "replyinfo spell_paths\n";
2419 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2292
2420 for (i = 0; i < NRSPELLPATHS; i++) 2293 for (int i = 0; i < NRSPELLPATHS; i++)
2421 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2294 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2422 sl.len = strlen ((char *) sl.buf); 2295
2423 if (sl.len >= MAXSOCKBUF) 2296 if (sl.length () >= MAXSOCKBUF)
2424 { 2297 {
2425 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2298 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2426 fatal (0); 2299 fatal (0);
2427 } 2300 }
2428 Send_With_Handling (ns, &sl); 2301
2429 free (sl.buf); 2302 ns->send_packet (sl);
2430} 2303}
2431 2304
2432/** 2305/**
2433 * This looks for any spells the player may have that have changed their stats. 2306 * 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 2307 * it then sends an updspell packet for each spell that has changed in this way
2435 */ 2308 */
2436void 2309void
2437esrv_update_spells (player *pl) 2310esrv_update_spells (player *pl)
2438{ 2311{
2439 SockList sl;
2440 int flags = 0;
2441 object *spell;
2442
2443 if (!pl->socket.monitor_spells) 2312 if (!pl->socket->monitor_spells)
2444 return; 2313 return;
2314
2445 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2315 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2446 { 2316 {
2447 if (spell->type == SPELL) 2317 if (spell->type == SPELL)
2448 { 2318 {
2319 int flags = 0;
2320
2449 /* check if we need to update it */ 2321 /* check if we need to update it */
2450 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2322 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2451 { 2323 {
2452 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2324 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2453 flags |= UPD_SP_MANA; 2325 flags |= UPD_SP_MANA;
2454 } 2326 }
2327
2455 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2328 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2456 { 2329 {
2457 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2330 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2458 flags |= UPD_SP_GRACE; 2331 flags |= UPD_SP_GRACE;
2459 } 2332 }
2333
2460 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2334 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2461 { 2335 {
2462 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2336 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2463 flags |= UPD_SP_DAMAGE; 2337 flags |= UPD_SP_DAMAGE;
2464 } 2338 }
2339
2465 if (flags != 0) 2340 if (flags)
2466 { 2341 {
2467 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2342 packet sl;
2468 strcpy ((char *) sl.buf, "updspell "); 2343
2469 sl.len = strlen ((char *) sl.buf); 2344 sl << "updspell "
2470 SockList_AddChar (&sl, flags); 2345 << uint8 (flags)
2471 SockList_AddInt (&sl, spell->count); 2346 << uint32 (spell->count);
2472 if (flags & UPD_SP_MANA) 2347
2473 SockList_AddShort (&sl, spell->last_sp); 2348 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2474 if (flags & UPD_SP_GRACE) 2349 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2475 SockList_AddShort (&sl, spell->last_grace); 2350 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2476 if (flags & UPD_SP_DAMAGE) 2351
2477 SockList_AddShort (&sl, spell->last_eat); 2352 pl->socket->send_packet (sl);
2478 flags = 0;
2479 Send_With_Handling (&pl->socket, &sl);
2480 free (sl.buf);
2481 } 2353 }
2482 } 2354 }
2483 } 2355 }
2484} 2356}
2485 2357
2486void 2358void
2487esrv_remove_spell (player *pl, object *spell) 2359esrv_remove_spell (player *pl, object *spell)
2488{ 2360{
2489 SockList sl;
2490
2491 if (!pl->socket.monitor_spells) 2361 if (!pl->socket->monitor_spells)
2492 return; 2362 return;
2363
2493 if (!pl || !spell || spell->env != pl->ob) 2364 if (!pl || !spell || spell->env != pl->ob)
2494 { 2365 {
2495 LOG (llevError, "Invalid call to esrv_remove_spell"); 2366 LOG (llevError, "Invalid call to esrv_remove_spell");
2496 return; 2367 return;
2497 } 2368 }
2498 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2369
2499 strcpy ((char *) sl.buf, "delspell "); 2370 packet sl;
2500 sl.len = strlen ((char *) sl.buf); 2371
2501 SockList_AddInt (&sl, spell->count); 2372 sl << "delspell "
2502 Send_With_Handling (&pl->socket, &sl); 2373 << uint32 (spell->count);
2503 free (sl.buf); 2374
2375 pl->socket->send_packet (sl);
2504} 2376}
2505 2377
2506/* appends the spell *spell to the Socklist we will send the data to. */ 2378/* appends the spell *spell to the Socklist we will send the data to. */
2507static void 2379static void
2508append_spell (player *pl, SockList * sl, object *spell) 2380append_spell (player *pl, packet &sl, object *spell)
2509{ 2381{
2510 int len, i, skill = 0; 2382 int len, i, skill = 0;
2511 2383
2512 if (!(spell->name)) 2384 if (!(spell->name))
2513 { 2385 {
2514 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2386 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2515 return; 2387 return;
2516 } 2388 }
2517 SockList_AddInt (sl, spell->count); 2389
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 */ 2390 /* 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); 2391 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); 2392 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); 2393 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 2394
2529 /* figure out which skill it uses, if it uses one */ 2395 /* figure out which skill it uses, if it uses one */
2530 if (spell->skill) 2396 if (spell->skill)
2531 { 2397 {
2532 for (i = 1; i < NUM_SKILLS; i++) 2398 for (i = 1; i < NUM_SKILLS; i++)
… …
2534 { 2400 {
2535 skill = i + CS_STAT_SKILLINFO; 2401 skill = i + CS_STAT_SKILLINFO;
2536 break; 2402 break;
2537 } 2403 }
2538 } 2404 }
2539 SockList_AddChar (sl, skill);
2540 2405
2541 SockList_AddInt (sl, spell->path_attuned); 2406 /* send the current values */
2407 sl << uint32 (spell->count)
2408 << uint16 (spell->level)
2409 << uint16 (spell->casting_time)
2410 << uint16 (spell->last_sp)
2411 << uint16 (spell->last_grace)
2412 << uint16 (spell->last_eat)
2413 << uint8 (skill)
2414 << uint32 (spell->path_attuned)
2542 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2415 << uint32 (spell->face ? spell->face->number : 0)
2543 2416 << data8 (spell->name)
2544 len = strlen (spell->name); 2417 << 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} 2418}
2561 2419
2562/** 2420/**
2563 * This tells the client to add the spell *ob, if *ob is NULL, then add 2421 * This tells the client to add the spell *ob, if *ob is NULL, then add
2564 * all spells in the player's inventory. 2422 * all spells in the player's inventory.
2565 */ 2423 */
2566void 2424void
2567esrv_add_spells (player *pl, object *spell) 2425esrv_add_spells (player *pl, object *spell)
2568{ 2426{
2569 SockList sl;
2570
2571 if (!pl) 2427 if (!pl)
2572 { 2428 {
2573 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2429 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2574 return; 2430 return;
2575 } 2431 }
2432
2576 if (!pl->socket.monitor_spells) 2433 if (!pl->socket->monitor_spells)
2577 return; 2434 return;
2578 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2435
2579 strcpy ((char *) sl.buf, "addspell "); 2436 packet sl;
2580 sl.len = strlen ((char *) sl.buf); 2437
2438 sl << "addspell ";
2439
2581 if (!spell) 2440 if (!spell)
2582 { 2441 {
2583 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2442 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2584 { 2443 {
2585 /* were we to simply keep appending data here, we could exceed 2444 /* 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 2454 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2596 * like it will fix this 2455 * like it will fix this
2597 */ 2456 */
2598 if (spell->type != SPELL) 2457 if (spell->type != SPELL)
2599 continue; 2458 continue;
2459
2600 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2460 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2601 { 2461 {
2602 Send_With_Handling (&pl->socket, &sl); 2462 pl->socket->send_packet (sl);
2603 strcpy ((char *) sl.buf, "addspell "); 2463
2604 sl.len = strlen ((char *) sl.buf); 2464 sl.reset ();
2465 sl << "addspell ";
2605 } 2466 }
2467
2606 append_spell (pl, &sl, spell); 2468 append_spell (pl, sl, spell);
2607 } 2469 }
2608 } 2470 }
2609 else if (spell->type != SPELL) 2471 else if (spell->type != SPELL)
2610 { 2472 {
2611 LOG (llevError, "Asked to send a non-spell object as a spell"); 2473 LOG (llevError, "Asked to send a non-spell object as a spell");
2612 return; 2474 return;
2613 } 2475 }
2614 else 2476 else
2615 append_spell (pl, &sl, spell); 2477 append_spell (pl, sl, spell);
2478
2616 if (sl.len >= MAXSOCKBUF) 2479 if (sl.length () >= MAXSOCKBUF)
2617 { 2480 {
2618 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2481 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2619 fatal (0); 2482 fatal (0);
2620 } 2483 }
2484
2621 /* finally, we can send the packet */ 2485 /* finally, we can send the packet */
2622 Send_With_Handling (&pl->socket, &sl); 2486 pl->socket->send_packet (sl);
2623 free (sl.buf);
2624} 2487}
2488

Diff Legend

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