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

Diff Legend

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