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.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.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 { 96 {
117 char buf[MAXSOCKBUF]; 97 packet sl;
118 98
119 sprintf (buf, "map_scroll %d %d", dx, dy); 99 sl.printf ("map_scroll %d %d", dx, dy);
120 Write_String_To_Socket (ns, buf, strlen (buf)); 100 ns->send_packet (sl);
121 } 101 }
122 102
123 /* If we are using the Map1aCmd, we may in fact send 103 /* If we are using the Map1aCmd, we may in fact send
124 * head information that is outside the viewable map. 104 * head information that is outside the viewable map.
125 * 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
… …
145 for (x = 0; x < mx; x++) 125 for (x = 0; x < mx; x++)
146 { 126 {
147 for (y = 0; y < my; y++) 127 for (y = 0; y < my; y++)
148 { 128 {
149 if (x >= ns->mapx || y >= ns->mapy) 129 if (x >= ns->mapx || y >= ns->mapy)
150 {
151 /* clear cells outside the viewable area */ 130 /* clear cells outside the viewable area */
152 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 131 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) 132 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 */ 133 /* clear newly visible tiles within the viewable area */
157 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 134 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
158 }
159 else 135 else
160 {
161 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));
162 }
163 } 137 }
164 } 138 }
165 139
166 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 140 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
167 141
… …
172} 146}
173 147
174static void 148static void
175clear_map (player *pl) 149clear_map (player *pl)
176{ 150{
177 NewSocket & socket = pl->socket; 151 client &socket = *pl->socket;
178 152
179 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 153 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
180 154
181 if (socket.newmapcmd == 1) 155 if (socket.newmapcmd == 1)
182 Write_String_To_Socket (&socket, "newmap", 6); 156 socket.send_packet ("newmap");
183 157
184 socket.update_look = 1; 158 socket.update_look = 1;
185 socket.look_position = 0; 159 socket.look_position = 0;
186} 160}
187 161
188/** check for map change and send new map data */ 162/** check for map change and send new map data */
189static void 163static void
190check_map_change (player *pl) 164check_map_change (player *pl)
191{ 165{
192 NewSocket & socket = pl->socket; 166 client &socket = *pl->socket;
193 object *ob = pl->ob; 167 object *ob = pl->ob;
194 char buf[MAX_BUF]; /* eauugggh */ 168 char buf[MAX_BUF]; /* eauugggh */
195 169
196 if (socket.current_map != ob->map) 170 if (socket.current_map != ob->map)
197 { 171 {
… …
218 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);
219 } 193 }
220 else 194 else
221 snprintf (buf, MAX_BUF, "mapinfo current"); 195 snprintf (buf, MAX_BUF, "mapinfo current");
222 196
223 Write_String_To_Socket (&socket, buf, strlen (buf)); 197 socket.send_packet (buf);
224 } 198 }
225 } 199 }
226 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)
227 { 201 {
228 int dx = ob->x - socket.current_x; 202 int dx = ob->x - socket.current_x;
… …
238 } 212 }
239 } 213 }
240 214
241 socket.current_x = ob->x; 215 socket.current_x = ob->x;
242 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);
243} 261}
244 262
245void 263void
246ExtCmd (char *buf, int len, player *pl) 264ExtCmd (char *buf, int len, player *pl)
247{ 265{
… …
266 if (!strncmp (buf, "spatial ", 8)) 284 if (!strncmp (buf, "spatial ", 8))
267 { 285 {
268 buf += 8; 286 buf += 8;
269 287
270 // initial map and its origin 288 // initial map and its origin
271 mapstruct *map = pl->ob->map; 289 maptile *map = pl->ob->map;
272 sint16 dx, dy; 290 sint16 dx, dy;
273 int mapx = pl->socket.mapx / 2 - pl->ob->x; 291 int mapx = pl->socket->mapx / 2 - pl->ob->x;
274 int mapy = pl->socket.mapy / 2 - pl->ob->y; 292 int mapy = pl->socket->mapy / 2 - pl->ob->y;
275 int max_distance = 8; // limit maximum path length to something generous 293 int max_distance = 8; // limit maximum path length to something generous
276 294
277 while (*buf && map && max_distance) 295 while (*buf && map && max_distance)
278 { 296 {
279 int dir = *buf++; 297 int dir = *buf++;
… …
330 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 348 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
331 } 349 }
332 else 350 else
333 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 351 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
334 352
335 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 353 pl->socket->send_packet (bigbuf);
336} 354}
337 355
338/** This is the Setup cmd - easy first implementation */ 356/** This is the Setup cmd - easy first implementation */
339void 357void
340SetUp (char *buf, int len, NewSocket * ns) 358SetUp (char *buf, int len, client * ns)
341{ 359{
342 int s, slen; 360 int s, slen;
343 char *cmd, *param, cmdback[HUGE_BUF]; 361 char *cmd, *param, cmdback[HUGE_BUF];
344 362
345 /* run through the cmds of setup 363 /* run through the cmds of setup
… …
347 * 365 *
348 * 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
349 * The client then must sort this out 367 * The client then must sort this out
350 */ 368 */
351 369
352 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 370 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
371
353 strcpy (cmdback, "setup"); 372 strcpy (cmdback, "setup");
354 for (s = 0; s < len;) 373 for (s = 0; s < len; )
355 { 374 {
356
357 cmd = &buf[s]; 375 cmd = &buf[s];
358 376
359 /* find the next space, and put a null there */ 377 /* find the next space, and put a null there */
360 for (; buf[s] && buf[s] != ' '; s++); 378 for (; buf[s] && buf[s] != ' '; s++)
379 ;
380
361 buf[s++] = 0; 381 buf[s++] = 0;
382
362 while (buf[s] == ' ') 383 while (buf[s] == ' ')
363 s++; 384 s++;
364 385
365 if (s >= len) 386 if (s >= len)
366 break; 387 break;
367 388
368 param = &buf[s]; 389 param = &buf[s];
369 390
370 for (; buf[s] && buf[s] != ' '; s++); 391 for (; buf[s] && buf[s] != ' '; s++)
392 ;
393
371 buf[s++] = 0; 394 buf[s++] = 0;
395
372 while (buf[s] == ' ') 396 while (buf[s] == ' ')
373 s++; 397 s++;
374 398
375 slen = strlen (cmdback); 399 slen = strlen (cmdback);
376 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 400 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
537 * report a failure to the client. 561 * report a failure to the client.
538 */ 562 */
539 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 563 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
540 } 564 }
541 } /* for processing all the setup commands */ 565 } /* for processing all the setup commands */
566
542 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 567 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
543 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 568 ns->send_packet (cmdback);
544} 569}
545 570
546/** 571/**
547 * The client has requested to be added to the game. 572 * 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. 573 * 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, 574 * 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. 575 * it either has to be here or init_sockets needs to be exported.
551 */ 576 */
552void 577void
553AddMeCmd (char *buf, int len, NewSocket * ns) 578AddMeCmd (char *buf, int len, client * ns)
554{ 579{
555 Settings oldsettings; 580 Settings oldsettings;
556 581
557 oldsettings = settings; 582 oldsettings = settings;
558 if (ns->status != Ns_Add || add_player (ns)) 583 if (ns->status != Ns_Add || add_player (ns))
559 { 584 ns->send_packet ("addme_failed");
560 Write_String_To_Socket (ns, "addme_failed", 12);
561 }
562 else 585 else
563 { 586 ns->send_packet ("addme_success");
564 /* Basically, the add_player copies the socket structure into 587
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; 588 settings = oldsettings;
574} 589}
575 590
576/** Reply to ExtendedInfos command */ 591/** Reply to ExtendedInfos command */
577void 592void
578ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 593ToggleExtendedInfos (char *buf, int len, client * ns)
579{ 594{
580 char cmdback[MAX_BUF]; 595 char cmdback[MAX_BUF];
581 char command[50]; 596 char command[50];
582 int info, nextinfo; 597 int info, nextinfo;
583 598
… …
621 { 636 {
622 strcat (cmdback, " "); 637 strcat (cmdback, " ");
623 strcat (cmdback, "smoothing"); 638 strcat (cmdback, "smoothing");
624 } 639 }
625 640
626 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 641 ns->send_packet (cmdback);
627} 642}
628 643
629/* 644/*
630#define MSG_TYPE_BOOK 1 645#define MSG_TYPE_BOOK 1
631#define MSG_TYPE_CARD 2 646#define MSG_TYPE_CARD 2
… …
634#define MSG_TYPE_MONUMENT 5 649#define MSG_TYPE_MONUMENT 5
635#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 650#define MSG_TYPE_SCRIPTED_DIALOG 6*/
636 651
637/** Reply to ExtendedInfos command */ 652/** Reply to ExtendedInfos command */
638void 653void
639ToggleExtendedText (char *buf, int len, NewSocket * ns) 654ToggleExtendedText (char *buf, int len, client * ns)
640{ 655{
641 char cmdback[MAX_BUF]; 656 char cmdback[MAX_BUF];
642 char temp[10]; 657 char temp[10];
643 char command[50]; 658 char command[50];
644 int info, nextinfo, i, flag; 659 int info, nextinfo, i, flag;
… …
684 strcat (cmdback, " "); 699 strcat (cmdback, " ");
685 snprintf (temp, sizeof (temp), "%d", i); 700 snprintf (temp, sizeof (temp), "%d", i);
686 strcat (cmdback, temp); 701 strcat (cmdback, temp);
687 } 702 }
688 703
689 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 704 ns->send_packet (cmdback);
690} 705}
691 706
692/** 707/**
693 * 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).
694 * 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
695 * 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
696 * 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
697 * client. 712 * client.
698 */ 713 */
699static void 714static void
700SendSmooth (NewSocket * ns, uint16 face) 715SendSmooth (client * ns, uint16 face)
701{ 716{
702 uint16 smoothface; 717 uint16 smoothface;
703 unsigned char reply[MAX_BUF];
704 SockList sl;
705 718
706 /* 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
707 * again. 720 * again.
708 */ 721 */
709 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 722 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
717 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 730 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
718 esrv_send_face (ns, smoothface, 0); 731 esrv_send_face (ns, smoothface, 0);
719 732
720 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 733 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
721 734
722 sl.buf = reply; 735 packet sl;
723 strcpy ((char *) sl.buf, "smooth "); 736
724 sl.len = strlen ((char *) sl.buf); 737 sl << "smooth "
725 SockList_AddShort (&sl, face); 738 << uint16 (face)
726 SockList_AddShort (&sl, smoothface); 739 << uint16 (smoothface);
727 Send_With_Handling (ns, &sl); 740
741 ns->send_packet (sl);
728} 742}
729 743
730 /** 744 /**
731 * Tells client the picture it has to use 745 * Tells client the picture it has to use
732 * to smooth a picture number given as argument. 746 * to smooth a picture number given as argument.
733 */ 747 */
734void 748void
735AskSmooth (char *buf, int len, NewSocket * ns) 749AskSmooth (char *buf, int len, client * ns)
736{ 750{
737 uint16 facenbr; 751 uint16 facenbr;
738 752
739 facenbr = atoi (buf); 753 facenbr = atoi (buf);
740 SendSmooth (ns, facenbr); 754 SendSmooth (ns, facenbr);
741} 755}
742
743
744
745
746 756
747/** 757/**
748 * 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,
749 * etc.) 759 * etc.)
750 */ 760 */
… …
801 * 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
802 * '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
803 * can throttle. 813 * can throttle.
804 */ 814 */
805void 815void
806NewPlayerCmd (uint8 * buf, int len, player *pl) 816NewPlayerCmd (char *buf, int len, player *pl)
807{ 817{
808 int time, repeat; 818 int time, repeat;
809 short packet;
810 unsigned char command[MAX_BUF]; 819 char command[MAX_BUF];
811 SockList sl; 820 int pktlen;
812 821
813 if (len < 7) 822 if (len < 7)
814 { 823 {
815 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);
816 return; 825 return;
817 } 826 }
818 827
819 packet = GetShort_String (buf); 828 pktlen = net_uint16 ((uint8 *)buf);
820 repeat = GetInt_String (buf + 2); 829 repeat = net_uint32 ((uint8 *)buf + 2);
830
821 /* -1 is special - no repeat, but don't update */ 831 /* -1 is special - no repeat, but don't update */
822 if (repeat != -1) 832 if (repeat != -1)
823 {
824 pl->count = repeat; 833 pl->count = repeat;
825 } 834
826 if ((len - 4) >= MAX_BUF) 835 if ((len - 4) >= MAX_BUF)
827 len = MAX_BUF - 5; 836 len = MAX_BUF - 5;
828 837
829 strncpy ((char *) command, (char *) buf + 6, len - 4); 838 strncpy ((char *) command, (char *) buf + 6, len - 4);
830 command[len - 4] = '\0'; 839 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 840
843 /* This should not happen anymore. */ 841 /* This should not happen anymore. */
844 if (pl->ob->speed_left < -1.0) 842 if (pl->ob->speed_left < -1.0)
845 {
846 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 843 LOG (llevError, "Player has negative time - shouldn't do command.\n");
847 } 844
848 /* In c_new.c */ 845 /* In c_new.c */
849 execute_newserver_command (pl->ob, (char *) command); 846 execute_newserver_command (pl->ob, (char *) command);
850 /* Perhaps something better should be done with a left over count. 847 /* Perhaps something better should be done with a left over count.
851 * Cleaning up the input should probably be done first - all actions 848 * 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 849 * for the command that issued the count should be done before any other
853 * commands. 850 * commands.
854 */ 851 */
855 pl->count = 0; 852 pl->count = 0;
856 853
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) 854 if (FABS (pl->ob->speed) < 0.001)
863 time = MAX_TIME * 100; 855 time = MAX_TIME * 100;
864 else 856 else
865 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 857 time = (int) (MAX_TIME / FABS (pl->ob->speed));
866 SockList_AddInt (&sl, time); 858
867 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);
868} 864}
869 865
870 866
871/** This is a reply to a previous query. */ 867/** This is a reply to a previous query. */
872void 868void
… …
939 * 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
940 * 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
941 * problem. 937 * problem.
942 */ 938 */
943void 939void
944VersionCmd (char *buf, int len, NewSocket * ns) 940VersionCmd (char *buf, int len, client * ns)
945{ 941{
946 char *cp; 942 char *cp;
947 char version_warning[256]; 943 char version_warning[256];
948 944
949 if (!buf) 945 if (!buf)
… …
973 cp = strchr (cp + 1, ' '); 969 cp = strchr (cp + 1, ' ');
974 if (cp) 970 if (cp)
975 { 971 {
976 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);
977 973
978 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 974 assign (ns->version, cp + 1);
979 975
980 /* This is first implementation - i skip all beta DX clients with it 976 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 { 977 {
991 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 978 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
992 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 979 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
993 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 980 ns->send_packet (version_warning);
994 } 981 }
995 982
996 } 983 }
997} 984}
998 985
999/** sound related functions. */ 986/** sound related functions. */
1000
1001void 987void
1002SetSound (char *buf, int len, NewSocket * ns) 988SetSound (char *buf, int len, client * ns)
1003{ 989{
1004 ns->sound = atoi (buf); 990 ns->sound = atoi (buf);
1005} 991}
1006 992
1007/** client wants the map resent */ 993/** client wants the map resent */
… …
1017 */ 1003 */
1018#if 0 1004#if 0
1019 /* 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
1020 * clear the "cache" 1006 * clear the "cache"
1021 */ 1007 */
1022 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 1008 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1023 draw_client_map (pl->ob); 1009 draw_client_map (pl->ob);
1024#endif 1010#endif
1025} 1011}
1026 1012
1027/** 1013/**
… …
1065/** 1051/**
1066 * 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
1067 * 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)
1068 */ 1054 */
1069void 1055void
1070send_query (NewSocket * ns, uint8 flags, char *text) 1056send_query (client * ns, uint8 flags, char *text)
1071{ 1057{
1072 char buf[MAX_BUF]; 1058 char buf[MAX_BUF];
1073 1059
1074 sprintf (buf, "query %d %s", flags, text ? text : ""); 1060 sprintf (buf, "query %d %s", flags, text ? text : "");
1075 Write_String_To_Socket (ns, buf, strlen (buf)); 1061 ns->send_packet (buf);
1076} 1062}
1077 1063
1078#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1064#define AddIfInt64(Old,New,Type) if (Old != New) {\
1079 Old = New; \ 1065 Old = New; \
1080 SockList_AddChar(&sl, Type); \ 1066 sl << uint8 (Type) << uint64 (New); \
1081 SockList_AddInt64(&sl, New); \
1082 } 1067 }
1083 1068
1084#define AddIfInt(Old,New,Type) if (Old != New) {\ 1069#define AddIfInt(Old,New,Type) if (Old != New) {\
1085 Old = New; \ 1070 Old = New; \
1086 SockList_AddChar(&sl, Type); \ 1071 sl << uint8 (Type) << uint32 (New); \
1087 SockList_AddInt(&sl, New); \
1088 } 1072 }
1089 1073
1090#define AddIfShort(Old,New,Type) if (Old != New) {\ 1074#define AddIfShort(Old,New,Type) if (Old != New) {\
1091 Old = New; \ 1075 Old = New; \
1092 SockList_AddChar(&sl, Type); \ 1076 sl << uint8 (Type) << uint16 (New); \
1093 SockList_AddShort(&sl, New); \
1094 } 1077 }
1095 1078
1096#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1079#define AddIfFloat(Old,New,Type) if (Old != New) {\
1097 Old = New; \ 1080 Old = New; \
1098 SockList_AddChar(&sl, Type); \ 1081 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1099 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1100 } 1082 }
1101 1083
1102#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1084#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1103 if (Old) free(Old);\
1104 Old = strdup_local(New);\ 1085 free(Old); Old = strdup (New);\
1105 SockList_AddChar(&sl, Type); \ 1086 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 } 1087 }
1110 1088
1111/** 1089/**
1112 * Sends a statistics update. We look at the old values, 1090 * Sends a statistics update. We look at the old values,
1113 * 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
… …
1115 * commands for now. 1093 * commands for now.
1116 */ 1094 */
1117void 1095void
1118esrv_update_stats (player *pl) 1096esrv_update_stats (player *pl)
1119{ 1097{
1120 SockList sl;
1121 char buf[MAX_BUF]; 1098 char buf[MAX_BUF];
1122 uint16 flags; 1099 uint16 flags;
1123 1100
1124 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1101 packet sl;
1125 strcpy ((char *) sl.buf, "stats "); 1102 sl << "stats ";
1126 sl.len = strlen ((char *) sl.buf);
1127 1103
1128 if (pl->ob != NULL) 1104 if (pl->ob != NULL)
1129 { 1105 {
1130 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);
1131 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);
… …
1139 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);
1140 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);
1141 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);
1142 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);
1143 } 1119 }
1120
1144 if (pl->socket.exp64) 1121 if (pl->socket->exp64)
1145 { 1122 {
1146 uint8 s; 1123 uint8 s;
1147 1124
1148 for (s = 0; s < NUM_SKILLS; s++) 1125 for (s = 0; s < NUM_SKILLS; s++)
1149 { 1126 {
1150 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)
1151 { 1128 {
1152
1153 /* Always send along the level if exp changes. This is only 1129 /* Always send along the level if exp changes. This is only
1154 * 1 extra byte, but keeps processing simpler. 1130 * 1 extra byte, but keeps processing simpler.
1155 */ 1131 */
1156 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1132 sl << uint8 (s + CS_STAT_SKILLINFO)
1157 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1133 << uint8 (pl->last_skill_ob[s]->level)
1158 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1134 << uint64 (pl->last_skill_ob[s]->stats.exp);
1135
1159 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;
1160 } 1137 }
1161 } 1138 }
1162 } 1139 }
1140
1163 if (pl->socket.exp64) 1141 if (pl->socket->exp64)
1164 {
1165 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) }
1166 }
1167 else 1143 else
1168 {
1169 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) }
1170 } 1145
1171 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1146 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1172 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);
1173 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);
1174 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);
1175 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1150 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1176 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);
1177 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);
1178 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);
1179 flags = 0; 1154 flags = 0;
1155
1180 if (pl->fire_on) 1156 if (pl->fire_on)
1181 flags |= SF_FIREON; 1157 flags |= SF_FIREON;
1158
1182 if (pl->run_on) 1159 if (pl->run_on)
1183 flags |= SF_RUNON; 1160 flags |= SF_RUNON;
1184 1161
1185 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1162 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1163
1186 if (pl->socket.sc_version < 1025) 1164 if (pl->socket->sc_version < 1025)
1187 {
1188 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) }
1189 }
1190 else 1166 else
1191 { 1167 {
1192 int i; 1168 int i;
1193 1169
1194 for (i = 0; i < NROFATTACKS; i++) 1170 for (i = 0; i < NROFATTACKS; i++)
1195 { 1171 {
1196 /* Skip ones we won't send */ 1172 /* Skip ones we won't send */
1197 if (atnr_cs_stat[i] == -1) 1173 if (atnr_cs_stat[i] == -1)
1198 continue; 1174 continue;
1175
1199 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]);
1200 } 1177 }
1201 } 1178 }
1179
1202 if (pl->socket.monitor_spells) 1180 if (pl->socket->monitor_spells)
1203 { 1181 {
1204 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);
1205 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);
1206 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);
1207 } 1185 }
1186
1208 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 */
1209 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1188 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1210 set_title (pl->ob, buf); 1189 set_title (pl->ob, buf);
1211 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1190 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1212 1191
1213 /* Only send it away if we have some actual data */ 1192 /* Only send it away if we have some actual data */
1214 if (sl.len > 6) 1193 if (sl.length () > 6)
1215 { 1194 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} 1195}
1223
1224 1196
1225/** 1197/**
1226 * 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.
1227 */ 1199 */
1228void 1200void
1229esrv_new_player (player *pl, uint32 weight) 1201esrv_new_player (player *pl, uint32 weight)
1230{ 1202{
1231 SockList sl;
1232
1233 pl->last_weight = weight; 1203 pl->last_weight = weight;
1234 1204
1235 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1205 packet sl;
1206 sl << "player ";
1236 1207
1237 strcpy ((char *) sl.buf, "player "); 1208 sl << uint32 (pl->ob->count)
1238 sl.len = strlen ((char *) sl.buf); 1209 << uint32 (weight)
1239 SockList_AddInt (&sl, pl->ob->count); 1210 << uint32 (pl->ob->face->number)
1240 SockList_AddInt (&sl, weight); 1211 << data8 (pl->ob->name);
1241 SockList_AddInt (&sl, pl->ob->face->number);
1242 1212
1243 SockList_AddChar (&sl, (char) strlen (pl->ob->name)); 1213 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); 1214 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1250} 1215}
1251
1252 1216
1253/** 1217/**
1254 * Need to send an animation sequence to the client. 1218 * Need to send an animation sequence to the client.
1255 * 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
1256 * 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
1257 * 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
1258 * when the player logs in and picks stuff up. 1222 * when the player logs in and picks stuff up.
1259 */ 1223 */
1260void 1224void
1261esrv_send_animation (NewSocket * ns, short anim_num) 1225esrv_send_animation (client * ns, short anim_num)
1262{ 1226{
1263 SockList sl;
1264 int i; 1227 int i;
1265 1228
1266 /* 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
1267 * 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
1268 * range, it must be a valid animation. 1231 * range, it must be a valid animation.
… …
1271 { 1234 {
1272 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);
1273 return; 1236 return;
1274 } 1237 }
1275 1238
1276 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1239 packet sl;
1277 strcpy ((char *) sl.buf, "anim "); 1240
1278 sl.len = 5; 1241 sl << "anim "
1279 SockList_AddShort (&sl, anim_num); 1242 << uint16 (anim_num)
1280 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1243 << uint16 (0); /* flags - not used right now */
1244
1281 /* 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
1282 * the face itself) down to the client. 1246 * the face itself) down to the client.
1283 */ 1247 */
1284 for (i = 0; i < animations[anim_num].num_animations; i++) 1248 for (i = 0; i < animations[anim_num].num_animations; i++)
1285 { 1249 {
1286 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))
1287 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1251 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1288 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 */
1289 } 1253 }
1290 Send_With_Handling (ns, &sl); 1254
1291 free (sl.buf); 1255 ns->send_packet (sl);
1256
1292 ns->anims_sent[anim_num] = 1; 1257 ns->anims_sent[anim_num] = 1;
1293} 1258}
1294 1259
1295 1260
1296/****************************************************************************** 1261/******************************************************************************
… …
1302/** 1267/**
1303 * 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
1304 * the face yet, we will also send it. 1269 * the face yet, we will also send it.
1305 */ 1270 */
1306static void 1271static void
1307esrv_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)
1308{ 1273{
1309 if (newmap->cells[x][y].count >= MAP_LAYERS) 1274 if (newmap->cells[x][y].count >= MAP_LAYERS)
1310 { 1275 {
1311 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);
1312 return; 1277 return;
1313 abort (); 1278 abort ();
1314 } 1279 }
1280
1315 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;
1316 newmap->cells[x][y].count++; 1282 newmap->cells[x][y].count++;
1283
1317 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1284 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1318 esrv_send_face (ns, face_num, 0); 1285 esrv_send_face (ns, face_num, 0);
1319} 1286}
1320 1287
1321struct LayerCell 1288struct LayerCell
… …
1330 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1297 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1331}; 1298};
1332 1299
1333/** Checkes if map cells have changed */ 1300/** Checkes if map cells have changed */
1334static int 1301static int
1335mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1302mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1336{ 1303{
1337 int k; 1304 int k;
1338 1305
1339 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)
1340 return 1; 1307 return 1;
… …
1353 * 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
1354 * 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
1355 * how many layers of data we should back. 1322 * how many layers of data we should back.
1356 */ 1323 */
1357static uint8 * 1324static uint8 *
1358compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1325compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1359{ 1326{
1360 int x, y, k; 1327 int x, y, k;
1361 int face; 1328 int face;
1362 unsigned char *fcur; 1329 unsigned char *fcur;
1363 struct MapLayer layers[MAP_LAYERS]; 1330 struct MapLayer layers[MAP_LAYERS];
… …
1423 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1390 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1424 } 1391 }
1425 return cur; 1392 return cur;
1426} 1393}
1427 1394
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 */ 1395/** Clears a map cell */
1465static void 1396static void
1466map_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)
1467{ 1398{
1468 cell->faces[0] = face0; 1399 cell->faces[0] = face0;
1469 cell->faces[1] = face1; 1400 cell->faces[1] = face1;
1470 cell->faces[2] = face2; 1401 cell->faces[2] = face2;
1471 cell->count = count; 1402 cell->count = count;
1472 cell->stat_hp = 0; 1403 cell->stat_hp = 0;
1404 cell->flags = 0;
1473 cell->player = 0; 1405 cell->player = 0;
1474} 1406}
1475 1407
1476#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1408#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1477#define MAX_LAYERS 3 1409#define MAX_LAYERS 3
1478 1410
… …
1506 * 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
1507 * 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
1508 * sent, it returns zero. 1440 * sent, it returns zero.
1509 */ 1441 */
1510static int 1442static int
1511check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1443check_head (packet &sl, client &ns, int ax, int ay, int layer)
1512{ 1444{
1513 short face_num; 1445 short face_num;
1514 1446
1515 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1447 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1516 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;
1517 else 1449 else
1518 face_num = 0; 1450 face_num = 0;
1519 1451
1520 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1452 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1521 { 1453 {
1522 SockList_AddShort (&sl, face_num); 1454 sl << uint16 (face_num);
1523 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1455 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1524 esrv_send_face (&ns, face_num, 0); 1456 esrv_send_face (&ns, face_num, 0);
1457
1525 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1458 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1526 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1459 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1527 return 1; 1460 return 1;
1528 } 1461 }
1529 1462
… …
1549 * 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
1550 * actually match. 1483 * actually match.
1551 */ 1484 */
1552 1485
1553static int 1486static int
1554update_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)
1555{ 1488{
1556 object *ob, *head; 1489 object *ob, *head;
1557 uint16 face_num; 1490 uint16 face_num;
1558 int bx, by, i; 1491 int bx, by, i;
1559 1492
1560 /* 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.
1561 * If not, then do the normal processing. 1494 * If not, then do the normal processing.
1562 */ 1495 */
1563
1564 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1496 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1565 1497
1566 /* 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
1567 * we would normally send for this space. If so, then 1499 * we would normally send for this space. If so, then
1568 * 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
… …
1733 1665
1734 /* 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
1735 * 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
1736 * this one. 1668 * this one.
1737 */ 1669 */
1738 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)
1739 {
1740 face_num = 0; 1671 face_num = 0;
1741 }
1742 1672
1743 /* 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
1744 * 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.
1745 */ 1675 */
1746 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1676 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1747 { 1677 {
1748 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1678 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1749 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1679 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1750 esrv_send_face (ns, face_num, 0); 1680 esrv_send_face (&ns, face_num, 0);
1751 SockList_AddShort (sl, face_num); 1681
1682 sl << uint16 (face_num);
1752 return 1; 1683 return 1;
1753 } 1684 }
1685
1754 /* Nothing changed */ 1686 /* Nothing changed */
1755 return 0; 1687 return 0;
1756} 1688}
1757 1689
1758/** 1690/**
… …
1773 * 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
1774 * take. 1706 * take.
1775 */ 1707 */
1776 1708
1777static inline int 1709static inline int
1778update_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)
1779{ 1711{
1780 object *ob; 1712 object *ob;
1781 int smoothlevel; /* old face_num; */ 1713 int smoothlevel; /* old face_num; */
1782 1714
1783 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1715 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1788 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1720 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1789 smoothlevel = 0; 1721 smoothlevel = 0;
1790 else 1722 else
1791 { 1723 {
1792 smoothlevel = ob->smoothlevel; 1724 smoothlevel = ob->smoothlevel;
1793 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1725 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1794 SendSmooth (ns, ob->face->number); 1726 SendSmooth (&ns, ob->face->number);
1795 } /* else not already head object or blank face */ 1727 } /* else not already head object or blank face */
1796 1728
1797 /* 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
1798 * 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.
1799 */ 1731 */
1800 if (smoothlevel > 255) 1732 if (smoothlevel > 255)
1801 smoothlevel = 255; 1733 smoothlevel = 255;
1802 else if (smoothlevel < 0) 1734 else if (smoothlevel < 0)
1803 smoothlevel = 0; 1735 smoothlevel = 0;
1736
1804 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1737 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1805 { 1738 {
1806 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1739 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1807 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1740 sl << uint8 (smoothlevel);
1808 return 1; 1741 return 1;
1809 } 1742 }
1743
1810 /* Nothing changed */ 1744 /* Nothing changed */
1811 return 0; 1745 return 0;
1812} 1746}
1813 1747
1814/** 1748/**
1815 * 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
1816 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1750 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1817 * available. 1751 * available.
1818 */ 1752 */
1819int 1753int
1820getExtendedMapInfoSize (NewSocket * ns) 1754getExtendedMapInfoSize (client * ns)
1821{ 1755{
1822 int result = 0; 1756 int result = 0;
1823 1757
1824 if (ns->ext_mapinfos) 1758 if (ns->ext_mapinfos)
1825 { 1759 {
… …
1855draw_client_map1 (object *pl) 1789draw_client_map1 (object *pl)
1856{ 1790{
1857 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;
1858 sint16 nx, ny; 1792 sint16 nx, ny;
1859 int estartlen, eoldlen; 1793 int estartlen, eoldlen;
1860 SockList sl;
1861 SockList esl; /*For extended Map info */
1862 uint16 mask, emask; 1794 uint16 mask, emask;
1863 uint8 eentrysize; 1795 uint8 eentrysize;
1864 uint16 ewhatstart, ewhatflag; 1796 uint16 ewhatstart, ewhatflag;
1865 uint8 extendedinfos; 1797 uint8 extendedinfos;
1866 mapstruct *m; 1798 maptile *m;
1867 1799
1868 NewSocket & socket = pl->contr->socket; 1800 client &socket = *pl->contr->socket;
1869 1801
1870 check_map_change (pl->contr); 1802 check_map_change (pl->contr);
1871 1803
1872 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1804 packet sl;
1873 if (socket.mapmode == Map1Cmd) 1805 packet esl;
1874 strcpy ((char *) sl.buf, "map1 "); 1806
1875 else 1807 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1876 strcpy ((char *) sl.buf, "map1a ");
1877 sl.len = strlen ((char *) sl.buf);
1878 startlen = sl.len; 1808 startlen = sl.length ();
1809
1879 /*Extendedmapinfo structure initialisation */ 1810 /*Extendedmapinfo structure initialisation */
1880 if (socket.ext_mapinfos) 1811 if (socket.ext_mapinfos)
1881 { 1812 {
1882 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1883 strcpy ((char *) esl.buf, "mapextended ");
1884 esl.len = strlen ((char *) esl.buf);
1885 extendedinfos = EMI_NOREDRAW; 1813 extendedinfos = EMI_NOREDRAW;
1814
1886 if (socket.EMI_smooth) 1815 if (socket.EMI_smooth)
1887 extendedinfos |= EMI_SMOOTH; 1816 extendedinfos |= EMI_SMOOTH;
1817
1888 ewhatstart = esl.len; 1818 ewhatstart = esl.length ();
1889 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1819 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1890 could need to be taken away */ 1820 could need to be taken away */
1891 SockList_AddChar (&esl, extendedinfos);
1892 eentrysize = getExtendedMapInfoSize (&socket); 1821 eentrysize = getExtendedMapInfoSize (&socket);
1893 SockList_AddChar (&esl, eentrysize); 1822 esl << "mapextended "
1823 << uint8 (extendedinfos)
1824 << uint8 (eentrysize);
1825
1894 estartlen = esl.len; 1826 estartlen = esl.length ();
1895 } 1827 }
1896 else 1828 else
1897 { 1829 {
1898 /* suppress compiler warnings */ 1830 /* suppress compiler warnings */
1899 ewhatstart = 0; 1831 ewhatstart = 0;
1900 ewhatflag = 0; 1832 ewhatflag = 0;
1901 estartlen = 0; 1833 estartlen = 0;
1902 } 1834 }
1835
1903 /* Init data to zero */ 1836 /* Init data to zero */
1904 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);
1905 1838
1906 /* 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
1907 * locations. 1840 * locations.
… …
1911 /* We could do this logic as conditionals in the if statement, 1844 /* We could do this logic as conditionals in the if statement,
1912 * but that started to get a bit messy to look at. 1845 * but that started to get a bit messy to look at.
1913 */ 1846 */
1914 max_x = pl->x + (socket.mapx + 1) / 2; 1847 max_x = pl->x + (socket.mapx + 1) / 2;
1915 max_y = pl->y + (socket.mapy + 1) / 2; 1848 max_y = pl->y + (socket.mapy + 1) / 2;
1849
1916 if (socket.mapmode == Map1aCmd) 1850 if (socket.mapmode == Map1aCmd)
1917 { 1851 {
1918 max_x += MAX_HEAD_OFFSET; 1852 max_x += MAX_HEAD_OFFSET;
1919 max_y += MAX_HEAD_OFFSET; 1853 max_y += MAX_HEAD_OFFSET;
1920 } 1854 }
… …
1935 */ 1869 */
1936 if (ax >= socket.mapx || ay >= socket.mapy) 1870 if (ax >= socket.mapx || ay >= socket.mapy)
1937 { 1871 {
1938 int i, got_one; 1872 int i, got_one;
1939 1873
1940 oldlen = sl.len; 1874 oldlen = sl.length ();
1941 1875
1942 SockList_AddShort (&sl, mask); 1876 sl << uint16 (mask);
1943 1877
1944 if (check_head (sl, socket, ax, ay, 2)) 1878 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1945 mask |= 0x4;
1946 if (check_head (sl, socket, ax, ay, 1)) 1879 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1947 mask |= 0x2;
1948 if (check_head (sl, socket, ax, ay, 0)) 1880 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1949 mask |= 0x1;
1950 1881
1951 /* 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
1952 * actually need to send that - just the coordinates 1883 * actually need to send that - just the coordinates
1953 * with no faces tells the client to blank out the 1884 * with no faces tells the client to blank out the
1954 * space. 1885 * space.
1955 */ 1886 */
1956 got_one = 0; 1887 got_one = 0;
1957 for (i = oldlen + 2; i < sl.len; i++) 1888 for (i = oldlen + 2; i < sl.length (); i++)
1958 {
1959 if (sl.buf[i]) 1889 if (sl[i])
1960 got_one = 1; 1890 got_one = 1;
1961 }
1962 1891
1963 if (got_one && (mask & 0xf)) 1892 if (got_one && (mask & 0xf))
1964 {
1965 sl.buf[oldlen + 1] = mask & 0xff; 1893 sl[oldlen + 1] = mask & 0xff;
1966 }
1967 else 1894 else
1968 { /*either all faces blank, either no face at all */ 1895 { /*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 */ 1896 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1970 sl.len = oldlen + 2; 1897 sl.reset (oldlen + 2);
1971 else 1898 else
1972 sl.len = oldlen; 1899 sl.reset (oldlen);
1973 } 1900 }
1901
1974 /*What concerns extendinfos, nothing to be done for now 1902 /*What concerns extendinfos, nothing to be done for now
1975 * (perhaps effects layer later) 1903 * (perhaps effects layer later)
1976 */ 1904 */
1977 continue; /* don't do processing below */ 1905 continue; /* don't do processing below */
1978 } 1906 }
1979 1907
1980 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1908 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1981 1909
1982 d = pl->contr->blocked_los[ax][ay]; 1910 d = pl->contr->blocked_los[ax][ay];
1983 1911
1984 /* 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,
1985 * we tell the client as such 1913 * we tell the client as such
1986 */ 1914 */
1987 nx = x; 1915 nx = x;
1988 ny = y; 1916 ny = y;
1989 m = get_map_from_coord (pl->map, &nx, &ny); 1917 m = get_map_from_coord (pl->map, &nx, &ny);
1918
1990 if (!m) 1919 if (!m)
1991 { 1920 {
1992 /* space is out of map. Update space and clear values 1921 /* space is out of map. Update space and clear values
1993 * 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
1994 * of the map, it shouldn't have a head 1923 * of the map, it shouldn't have a head
1995 */ 1924 */
1996 if (lastcell.count != -1) 1925 if (lastcell.count != -1)
1997 { 1926 {
1998 SockList_AddShort (&sl, mask); 1927 sl << uint16 (mask);
1999 map_clearcell (&lastcell, 0, 0, 0, -1); 1928 map_clearcell (&lastcell, 0, 0, 0, -1);
2000 } 1929 }
2001 } 1930 }
2002 else if (d > 3) 1931 else if (d > 3)
2003 { 1932 {
… …
2005 1934
2006 /* This block deals with spaces that are not visible for whatever 1935 /* This block deals with spaces that are not visible for whatever
2007 * reason. Still may need to send the head for this space. 1936 * reason. Still may need to send the head for this space.
2008 */ 1937 */
2009 1938
2010 oldlen = sl.len; 1939 oldlen = sl.length ();
2011 1940
2012 SockList_AddShort (&sl, mask); 1941 sl << uint16 (mask);
1942
2013 if (lastcell.count != -1) 1943 if (lastcell.count != -1)
2014 need_send = 1; 1944 need_send = 1;
1945
2015 count = -1; 1946 count = -1;
2016 1947
2017 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1948 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2018 { 1949 {
2019 /* Now check to see if any heads need to be sent */ 1950 /* Now check to see if any heads need to be sent */
2020 1951
2021 if (check_head (sl, socket, ax, ay, 2)) 1952 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2022 mask |= 0x4;
2023 if (check_head (sl, socket, ax, ay, 1)) 1953 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2024 mask |= 0x2;
2025 if (check_head (sl, socket, ax, ay, 0)) 1954 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2026 mask |= 0x1;
2027 1955
2028 lastcell.count = count; 1956 lastcell.count = count;
2029
2030 } 1957 }
2031 else 1958 else
2032 { 1959 {
2033 struct MapCell *cell = &lastcell;
2034
2035 /* properly clear a previously sent big face */ 1960 /* properly clear a previously sent big face */
2036 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)
2037 need_send = 1; 1963 need_send = 1;
1964
2038 map_clearcell (&lastcell, 0, 0, 0, count); 1965 map_clearcell (&lastcell, 0, 0, 0, count);
2039 } 1966 }
2040 1967
2041 if ((mask & 0xf) || need_send) 1968 if ((mask & 0xf) || need_send)
2042 {
2043 sl.buf[oldlen + 1] = mask & 0xff; 1969 sl[oldlen + 1] = mask & 0xff;
2044 }
2045 else 1970 else
2046 {
2047 sl.len = oldlen; 1971 sl.reset (oldlen);
2048 }
2049 } 1972 }
2050 else 1973 else
2051 { 1974 {
2052 /* 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
2053 * we need to send. 1976 * we need to send.
… …
2055 1978
2056 /* Rather than try to figure out what everything that we might 1979 /* Rather than try to figure out what everything that we might
2057 * need to send is, then form the packet after that, 1980 * need to send is, then form the packet after that,
2058 * 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
2059 * 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,
2060 * 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
2061 * is done. 1984 * is done.
2062 * 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
2063 * what if anything we need to send, setting the bits, then 1986 * what if anything we need to send, setting the bits, then
2064 * doing those checks again to add the real data. 1987 * doing those checks again to add the real data.
2065 */ 1988 */
2066 oldlen = sl.len; 1989 oldlen = sl.length ();
2067 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1990 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2068 eoldlen = esl.len; 1991 eoldlen = esl.length ();
2069 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1992 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2070 SockList_AddShort (&sl, mask); 1993 sl << uint16 (mask);
2071 1994
2072 if (socket.ext_mapinfos) 1995 if (socket.ext_mapinfos)
2073 SockList_AddShort (&esl, emask); 1996 esl << uint16 (emask);
2074 1997
2075 unsigned char dummy; 1998 unsigned char dummy;
2076 unsigned char *last_ext = &dummy; 1999 unsigned char *last_ext = &dummy;
2077 2000
2078 /* Darkness changed */ 2001 /* Darkness changed */
… …
2081 mask |= 0x8; 2004 mask |= 0x8;
2082 2005
2083 if (socket.extmap) 2006 if (socket.extmap)
2084 { 2007 {
2085 *last_ext |= 0x80; 2008 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 2009 last_ext = &sl[sl.length ()];
2087 SockList_AddChar (&sl, d); 2010 sl << uint8 (d);
2088 } 2011 }
2089 else 2012 else
2090 SockList_AddChar (&sl, 255 - 64 * d); 2013 sl << uint8 (255 - 64 * d);
2091 } 2014 }
2092 2015
2093 lastcell.count = d; 2016 lastcell.count = d;
2094 2017
2095 if (socket.extmap) 2018 if (socket.extmap)
2096 { 2019 {
2097 uint8 stat_hp = 0; 2020 uint8 stat_hp = 0;
2098 uint8 stat_width = 0; 2021 uint8 stat_width = 0;
2022 uint8 flags = 0;
2099 tag_t player = 0; 2023 UUID player = 0;
2100 2024
2101 // send hp information, if applicable 2025 // send hp information, if applicable
2102 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2026 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2103 { 2027 {
2104 if (op->head || op->invisible) 2028 if (op->head || op->invisible)
… …
2111 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 2035 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2112 stat_width = op->arch->tail_x; 2036 stat_width = op->arch->tail_x;
2113 } 2037 }
2114 } 2038 }
2115 2039
2040 if (op->msg && op->msg[0] == '@')
2041 flags |= 1;
2042
2116 if (op->type == PLAYER && op != pl) 2043 if (op->type == PLAYER && op != pl)
2117 player = op->count; 2044 player = op->count;
2118 } 2045 }
2119 2046
2120 if (lastcell.stat_hp != stat_hp) 2047 if (lastcell.stat_hp != stat_hp)
2121 { 2048 {
2122 lastcell.stat_hp = stat_hp; 2049 lastcell.stat_hp = stat_hp;
2123 2050
2124 mask |= 0x8; 2051 mask |= 0x8;
2125 *last_ext |= 0x80; 2052 *last_ext |= 0x80;
2126 last_ext = sl.buf + sl.len; 2053 last_ext = &sl[sl.length ()];
2127 SockList_AddChar (&sl, 5); 2054
2128 SockList_AddChar (&sl, stat_hp); 2055 sl << uint8 (5) << uint8 (stat_hp);
2129 2056
2130 if (stat_width > 1) 2057 if (stat_width > 1)
2131 { 2058 {
2132 *last_ext |= 0x80; 2059 *last_ext |= 0x80;
2133 last_ext = sl.buf + sl.len; 2060 last_ext = &sl[sl.length ()];
2134 SockList_AddChar (&sl, 6); 2061
2135 SockList_AddChar (&sl, stat_width); 2062 sl << uint8 (6) << uint8 (stat_width);
2136 } 2063 }
2137 } 2064 }
2138 2065
2139 if (lastcell.player !=player) 2066 if (lastcell.player != player)
2140 { 2067 {
2141 lastcell.player = player; 2068 lastcell.player = player;
2142 2069
2143 mask |= 0x8; 2070 mask |= 0x8;
2144 *last_ext |= 0x80; 2071 *last_ext |= 0x80;
2145 last_ext = sl.buf + sl.len; 2072 last_ext = &sl[sl.length ()];
2146 SockList_AddChar (&sl, 0x47); 2073
2147 SockList_AddChar (&sl, 4); 2074 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2148 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);
2149 } 2086 }
2150 } 2087 }
2151 2088
2152 /* Floor face */ 2089 /* Floor face */
2153 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 2090 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2154 mask |= 0x4; 2091 mask |= 0x4;
2155 2092
2156 if (socket.EMI_smooth) 2093 if (socket.EMI_smooth)
2157 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 2094 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2158 emask |= 0x4; 2095 emask |= 0x4;
2159 2096
2160 /* Middle face */ 2097 /* Middle face */
2161 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 2098 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2162 mask |= 0x2; 2099 mask |= 0x2;
2163 2100
2164 if (socket.EMI_smooth) 2101 if (socket.EMI_smooth)
2165 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 2102 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2166 emask |= 0x2; 2103 emask |= 0x2;
2167 2104
2168 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))
2169 { 2106 {
2170 if (lastcell.faces[0] != pl->face->number) 2107 if (lastcell.faces[0] != pl->face->number)
2171 { 2108 {
2172 lastcell.faces[0] = pl->face->number; 2109 lastcell.faces[0] = pl->face->number;
2173 mask |= 0x1; 2110 mask |= 0x1;
2111
2174 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 2112 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2175 esrv_send_face (&socket, pl->face->number, 0); 2113 esrv_send_face (&socket, pl->face->number, 0);
2176 SockList_AddShort (&sl, pl->face->number); 2114
2115 sl << uint16 (pl->face->number);
2177 } 2116 }
2178 } 2117 }
2179 /* Top face */
2180 else 2118 else
2181 { 2119 {
2120 /* Top face */
2182 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 2121 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2183 mask |= 0x1; 2122 mask |= 0x1;
2123
2184 if (socket.EMI_smooth) 2124 if (socket.EMI_smooth)
2185 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 2125 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2186 {
2187 emask |= 0x1; 2126 emask |= 0x1;
2188 }
2189 } 2127 }
2128
2190 /* 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
2191 * space by checking the mask. If so, update the mask. 2130 * space by checking the mask. If so, update the mask.
2192 * 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
2193 * value, so we don't send those bits. 2132 * value, so we don't send those bits.
2194 */ 2133 */
2195 if (mask & 0xf) 2134 if (mask & 0xf)
2196 {
2197 sl.buf[oldlen + 1] = mask & 0xff; 2135 sl[oldlen + 1] = mask & 0xff;
2198 }
2199 else 2136 else
2200 {
2201 sl.len = oldlen; 2137 sl.reset (oldlen);
2202 } 2138
2203 if (emask & 0xf) 2139 if (emask & 0xf)
2204 {
2205 esl.buf[eoldlen + 1] = emask & 0xff; 2140 esl[eoldlen + 1] = emask & 0xff;
2206 }
2207 else 2141 else
2208 {
2209 esl.len = eoldlen; 2142 esl.reset (eoldlen);
2210 }
2211 } /* else this is a viewable space */ 2143 } /* else this is a viewable space */
2212 } /* for x loop */ 2144 } /* for x loop */
2213 } /* for y loop */ 2145 } /* for y loop */
2214 2146
2215 /* Verify that we in fact do need to send this */ 2147 /* Verify that we in fact do need to send this */
2216 if (socket.ext_mapinfos) 2148 if (socket.ext_mapinfos)
2217 { 2149 {
2218 if (!(sl.len > startlen || socket.sent_scroll)) 2150 if (!(sl.length () > startlen || socket.sent_scroll))
2219 { 2151 {
2220 /* No map data will follow, so don't say the client 2152 /* No map data will follow, so don't say the client
2221 * it doesn't need draw! 2153 * it doesn't need draw!
2222 */ 2154 */
2223 ewhatflag &= (~EMI_NOREDRAW); 2155 ewhatflag &= (~EMI_NOREDRAW);
2224 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2156 esl[ewhatstart + 1] = ewhatflag & 0xff;
2225 } 2157 }
2158
2226 if (esl.len > estartlen) 2159 if (esl.length () > estartlen)
2227 { 2160 socket.send_packet (esl);
2228 Send_With_Handling (&socket, &esl);
2229 }
2230 free (esl.buf);
2231 } 2161 }
2162
2232 if (sl.len > startlen || socket.sent_scroll) 2163 if (sl.length () > startlen || socket.sent_scroll)
2233 { 2164 {
2234 Send_With_Handling (&socket, &sl); 2165 socket.send_packet (sl);
2235 socket.sent_scroll = 0; 2166 socket.sent_scroll = 0;
2236 } 2167 }
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