ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.18 by root, Thu Sep 14 19:08:41 2006 UTC vs.
Revision 1.41 by root, Fri Dec 15 19:59:20 2006 UTC

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

Diff Legend

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