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.54 by root, Mon Dec 25 14:54:44 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.
… …
44 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
45 * 39 *
46 * esrv_map_setbelow allows filling in all of the faces for the map. 40 * esrv_map_setbelow allows filling in all of the faces for the map.
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
50 * operations
51 *
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 */ 43 */
58 44
59#include <global.h> 45#include <global.h>
60#include <sproto.h> 46#include <sproto.h>
61 47
62#include <newclient.h>
63#include <newserver.h>
64#include <living.h> 48#include <living.h>
65#include <commands.h> 49#include <commands.h>
66 50
67/* This block is basically taken from socket.c - I assume if it works there, 51/* This block is basically taken from socket.c - I assume if it works there,
68 * it should work here. 52 * it should work here.
69 */ 53 */
70#ifndef WIN32 /* ---win32 exclude unix headers */
71# include <sys/types.h> 54#include <sys/types.h>
72# include <sys/time.h> 55#include <sys/time.h>
73# include <sys/socket.h> 56#include <sys/socket.h>
74# include <netinet/in.h> 57#include <netinet/in.h>
75# include <netdb.h> 58#include <netdb.h>
76#endif /* win32 */
77 59
78#ifdef HAVE_UNISTD_H
79# include <unistd.h> 60#include <unistd.h>
80#endif
81
82#ifdef HAVE_SYS_TIME_H
83# include <sys/time.h> 61#include <sys/time.h>
84#endif
85 62
86#include "sounds.h" 63#include "sounds.h"
87 64
88/** 65/**
89 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
… …
106 -1, /* life stealing */ 83 -1, /* life stealing */
107 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
108}; 85};
109 86
110static void 87static void
111socket_map_scroll (NewSocket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
112{ 89{
113 struct Map newmap; 90 struct Map newmap;
114 int x, y, mx, my; 91 int x, y, mx, my;
115 92
116 {
117 char buf[MAXSOCKBUF];
118
119 sprintf (buf, "map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
120 Write_String_To_Socket (ns, buf, strlen (buf));
121 }
122 94
123 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
124 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
125 * So set the mx,my to the max value we want to 97 * So set the mx,my to the max value we want to
126 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
145 for (x = 0; x < mx; x++) 117 for (x = 0; x < mx; x++)
146 { 118 {
147 for (y = 0; y < my; y++) 119 for (y = 0; y < my; y++)
148 { 120 {
149 if (x >= ns->mapx || y >= ns->mapy) 121 if (x >= ns->mapx || y >= ns->mapy)
150 {
151 /* clear cells outside the viewable area */ 122 /* clear cells outside the viewable area */
152 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 123 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) 124 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 */ 125 /* clear newly visible tiles within the viewable area */
157 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 126 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
158 }
159 else 127 else
160 {
161 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 128 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
162 }
163 } 129 }
164 } 130 }
165 131
166 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 132 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
167 133
… …
172} 138}
173 139
174static void 140static void
175clear_map (player *pl) 141clear_map (player *pl)
176{ 142{
177 NewSocket & socket = pl->socket;
178
179 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
180 144
181 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
182 Write_String_To_Socket (&socket, "newmap", 6); 146 pl->ns->send_packet ("newmap");
183 147
184 socket.update_look = 1; 148 pl->ns->floorbox_reset ();
185 socket.look_position = 0;
186} 149}
187 150
188/** check for map change and send new map data */ 151/** check for map change and send new map data */
189static void 152static void
190check_map_change (player *pl) 153check_map_change (player *pl)
191{ 154{
192 NewSocket & socket = pl->socket; 155 client &socket = *pl->ns;
193 object *ob = pl->ob; 156 object *ob = pl->ob;
194 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
195 158
196 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
197 { 160 {
… …
218 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
219 } 182 }
220 else 183 else
221 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
222 185
223 Write_String_To_Socket (&socket, buf, strlen (buf)); 186 socket.send_packet (buf);
224 } 187 }
225 } 188 }
226 else if (socket.current_x != ob->x || socket.current_y != ob->y) 189 else if (socket.current_x != ob->x || socket.current_y != ob->y)
227 { 190 {
228 int dx = ob->x - socket.current_x; 191 int dx = ob->x - socket.current_x;
… …
231 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
232 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
233 else 196 else
234 { 197 {
235 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
236 socket.update_look = 1; 199 socket.floorbox_reset ();
237 socket.look_position = 0;
238 } 200 }
239 } 201 }
240 202
241 socket.current_x = ob->x; 203 socket.current_x = ob->x;
242 socket.current_y = ob->y; 204 socket.current_y = ob->y;
243} 205}
244 206
207/**
208 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide
210 * that information.
211 */
212void
213RequestInfo (char *buf, int len, client * ns)
214{
215 char *params = NULL, *cp;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227
228 /* find the first space, make it null, and update the
229 * params pointer.
230 */
231 for (cp = buf; *cp != '\0'; cp++)
232 if (*cp == ' ')
233 {
234 *cp = '\0';
235 params = cp + 1;
236 break;
237 }
238
239 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params);
241 else if (!strcmp (buf, "image_sums"))
242 send_image_sums (ns, params);
243 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params);
247 else
248 ns->send_packet (bigbuf, len);
249}
250
245void 251void
246ExtCmd (char *buf, int len, player *pl) 252ExtCmd (char *buf, int len, player *pl)
247{ 253{
248 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
255}
256
257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
249} 261}
250 262
251void 263void
252MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
253{ 265{
… …
266 if (!strncmp (buf, "spatial ", 8)) 278 if (!strncmp (buf, "spatial ", 8))
267 { 279 {
268 buf += 8; 280 buf += 8;
269 281
270 // initial map and its origin 282 // initial map and its origin
271 mapstruct *map = pl->ob->map; 283 maptile *map = pl->ob->map;
272 sint16 dx, dy; 284 sint16 dx, dy;
273 int mapx = pl->socket.mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
274 int mapy = pl->socket.mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
275 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
276 288
277 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
278 { 290 {
279 int dir = *buf++; 291 int dir = *buf++;
… …
330 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
331 } 343 }
332 else 344 else
333 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
334 346
335 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 347 pl->ns->send_packet (bigbuf);
336} 348}
337 349
338/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
339void 351void
340SetUp (char *buf, int len, NewSocket * ns) 352SetUp (char *buf, int len, client * ns)
341{ 353{
342 int s, slen; 354 int s, slen;
343 char *cmd, *param, cmdback[HUGE_BUF]; 355 char *cmd, *param, cmdback[HUGE_BUF];
344 356
345 /* run through the cmds of setup 357 /* run through the cmds of setup
… …
347 * 359 *
348 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 360 * 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 361 * The client then must sort this out
350 */ 362 */
351 363
352 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 364 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
365
353 strcpy (cmdback, "setup"); 366 strcpy (cmdback, "setup");
354 for (s = 0; s < len;) 367 for (s = 0; s < len; )
355 { 368 {
356
357 cmd = &buf[s]; 369 cmd = &buf[s];
358 370
359 /* find the next space, and put a null there */ 371 /* find the next space, and put a null there */
360 for (; buf[s] && buf[s] != ' '; s++); 372 for (; buf[s] && buf[s] != ' '; s++)
373 ;
374
361 buf[s++] = 0; 375 buf[s++] = 0;
376
362 while (buf[s] == ' ') 377 while (buf[s] == ' ')
363 s++; 378 s++;
364 379
365 if (s >= len) 380 if (s >= len)
366 break; 381 break;
367 382
368 param = &buf[s]; 383 param = &buf[s];
369 384
370 for (; buf[s] && buf[s] != ' '; s++); 385 for (; buf[s] && buf[s] != ' '; s++)
386 ;
387
371 buf[s++] = 0; 388 buf[s++] = 0;
389
372 while (buf[s] == ' ') 390 while (buf[s] == ' ')
373 s++; 391 s++;
374 392
375 slen = strlen (cmdback); 393 slen = strlen (cmdback);
376 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 394 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
381 { 399 {
382 ns->sound = atoi (param); 400 ns->sound = atoi (param);
383 safe_strcat (cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
384 } 402 }
385 else if (!strcmp (cmd, "exp64")) 403 else if (!strcmp (cmd, "exp64"))
386 {
387 ns->exp64 = atoi (param);
388 safe_strcat (cmdback, param, &slen, HUGE_BUF); 404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
389 }
390 else if (!strcmp (cmd, "spellmon")) 405 else if (!strcmp (cmd, "spellmon"))
391 { 406 {
392 ns->monitor_spells = atoi (param); 407 ns->monitor_spells = atoi (param);
393 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
394 } 409 }
… …
537 * report a failure to the client. 552 * report a failure to the client.
538 */ 553 */
539 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 554 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
540 } 555 }
541 } /* for processing all the setup commands */ 556 } /* for processing all the setup commands */
557
542 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 558 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
543 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 559 ns->send_packet (cmdback);
544} 560}
545 561
546/** 562/**
547 * The client has requested to be added to the game. 563 * 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. 564 * 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, 565 * 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. 566 * it either has to be here or init_sockets needs to be exported.
551 */ 567 */
552void 568void
553AddMeCmd (char *buf, int len, NewSocket * ns) 569AddMeCmd (char *buf, int len, client * ns)
554{ 570{
555 Settings oldsettings; 571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
556
557 oldsettings = settings;
558 if (ns->status != Ns_Add || add_player (ns))
559 {
560 Write_String_To_Socket (ns, "addme_failed", 12);
561 }
562 else
563 {
564 /* Basically, the add_player copies the socket structure into
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;
574} 572}
575 573
576/** Reply to ExtendedInfos command */ 574/** Reply to ExtendedInfos command */
577void 575void
578ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 576ToggleExtendedInfos (char *buf, int len, client * ns)
579{ 577{
580 char cmdback[MAX_BUF]; 578 char cmdback[MAX_BUF];
581 char command[50]; 579 char command[50];
582 int info, nextinfo; 580 int info, nextinfo;
583 581
… …
621 { 619 {
622 strcat (cmdback, " "); 620 strcat (cmdback, " ");
623 strcat (cmdback, "smoothing"); 621 strcat (cmdback, "smoothing");
624 } 622 }
625 623
626 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 624 ns->send_packet (cmdback);
627} 625}
628 626
629/* 627/*
630#define MSG_TYPE_BOOK 1 628#define MSG_TYPE_BOOK 1
631#define MSG_TYPE_CARD 2 629#define MSG_TYPE_CARD 2
… …
634#define MSG_TYPE_MONUMENT 5 632#define MSG_TYPE_MONUMENT 5
635#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 633#define MSG_TYPE_SCRIPTED_DIALOG 6*/
636 634
637/** Reply to ExtendedInfos command */ 635/** Reply to ExtendedInfos command */
638void 636void
639ToggleExtendedText (char *buf, int len, NewSocket * ns) 637ToggleExtendedText (char *buf, int len, client * ns)
640{ 638{
641 char cmdback[MAX_BUF]; 639 char cmdback[MAX_BUF];
642 char temp[10]; 640 char temp[10];
643 char command[50]; 641 char command[50];
644 int info, nextinfo, i, flag; 642 int info, nextinfo, i, flag;
… …
684 strcat (cmdback, " "); 682 strcat (cmdback, " ");
685 snprintf (temp, sizeof (temp), "%d", i); 683 snprintf (temp, sizeof (temp), "%d", i);
686 strcat (cmdback, temp); 684 strcat (cmdback, temp);
687 } 685 }
688 686
689 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 687 ns->send_packet (cmdback);
690} 688}
691 689
692/** 690/**
693 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 691 * 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 692 * 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 693 * 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 694 * if we know the client wants it, might as well push it to the
697 * client. 695 * client.
698 */ 696 */
699static void 697static void
700SendSmooth (NewSocket * ns, uint16 face) 698SendSmooth (client *ns, uint16 face)
701{ 699{
702 uint16 smoothface; 700 uint16 smoothface;
703 unsigned char reply[MAX_BUF];
704 SockList sl;
705 701
706 /* If we can't find a face, return and set it so we won't try to send this 702 /* If we can't find a face, return and set it so we won't try to send this
707 * again. 703 * again.
708 */ 704 */
709 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 705 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
717 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
718 esrv_send_face (ns, smoothface, 0); 714 esrv_send_face (ns, smoothface, 0);
719 715
720 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
721 717
722 sl.buf = reply; 718 packet sl ("smooth");
723 strcpy ((char *) sl.buf, "smooth "); 719
724 sl.len = strlen ((char *) sl.buf); 720 sl << uint16 (face)
725 SockList_AddShort (&sl, face); 721 << uint16 (smoothface);
726 SockList_AddShort (&sl, smoothface); 722
727 Send_With_Handling (ns, &sl); 723 ns->send_packet (sl);
728} 724}
729 725
730 /** 726 /**
731 * Tells client the picture it has to use 727 * Tells client the picture it has to use
732 * to smooth a picture number given as argument. 728 * to smooth a picture number given as argument.
733 */ 729 */
734void 730void
735AskSmooth (char *buf, int len, NewSocket * ns) 731AskSmooth (char *buf, int len, client *ns)
736{ 732{
737 uint16 facenbr; 733 SendSmooth (ns, atoi (buf));
738
739 facenbr = atoi (buf);
740 SendSmooth (ns, facenbr);
741} 734}
742
743
744
745
746 735
747/** 736/**
748 * This handles the general commands from the client (ie, north, fire, cast, 737 * This handles the general commands from the client (ie, north, fire, cast,
749 * etc.) 738 * etc.)
750 */ 739 */
751void 740void
752PlayerCmd (char *buf, int len, player *pl) 741PlayerCmd (char *buf, int len, player *pl)
753{ 742{
754
755 /* The following should never happen with a proper or honest client.
756 * Therefore, the error message doesn't have to be too clear - if
757 * someone is playing with a hacked/non working client, this gives them
758 * an idea of the problem, but they deserve what they get
759 */
760 if (pl->state != ST_PLAYING)
761 {
762 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
763 return;
764 }
765 /* Check if there is a count. In theory, a zero count could also be 743 /* Check if there is a count. In theory, a zero count could also be
766 * sent, so check for that also. 744 * sent, so check for that also.
767 */ 745 */
768 if (atoi (buf) || buf[0] == '0') 746 if (atoi (buf) || buf[0] == '0')
769 { 747 {
770 pl->count = atoi ((char *) buf); 748 pl->count = atoi ((char *) buf);
749
771 buf = strchr (buf, ' '); /* advance beyond the numbers */ 750 buf = strchr (buf, ' '); /* advance beyond the numbers */
772 if (!buf) 751 if (!buf)
773 {
774#ifdef ESRV_DEBUG
775 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
776#endif
777 return; 752 return;
778 } 753
779 buf++; 754 buf++;
780 } 755 }
781 /* This should not happen anymore. */ 756
782 if (pl->ob->speed_left < -1.0)
783 {
784 LOG (llevError, "Player has negative time - shouldn't do command.\n");
785 }
786 /* In c_new.c */
787 execute_newserver_command (pl->ob, (char *) buf); 757 execute_newserver_command (pl->ob, (char *) buf);
758
788 /* Perhaps something better should be done with a left over count. 759 /* Perhaps something better should be done with a left over count.
789 * Cleaning up the input should probably be done first - all actions 760 * Cleaning up the input should probably be done first - all actions
790 * for the command that issued the count should be done before any other 761 * for the command that issued the count should be done before any other
791 * commands. 762 * commands.
792 */ 763 */
793
794 pl->count = 0; 764 pl->count = 0;
795
796} 765}
797 766
798 767
799/** 768/**
800 * This handles the general commands from the client (ie, north, fire, cast, 769 * This handles the general commands from the client (ie, north, fire, cast,
801 * etc.). It is a lot like PlayerCmd above, but is called with the 770 * 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 771 * 'ncom' method which gives more information back to the client so it
803 * can throttle. 772 * can throttle.
804 */ 773 */
805void 774void
806NewPlayerCmd (uint8 * buf, int len, player *pl) 775NewPlayerCmd (char *buf, int len, player *pl)
807{ 776{
808 int time, repeat;
809 short packet;
810 unsigned char command[MAX_BUF];
811 SockList sl;
812
813 if (len < 7) 777 if (len <= 6)
814 { 778 {
815 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 779 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
816 return; 780 return;
817 } 781 }
818 782
819 packet = GetShort_String (buf); 783 uint16 cmdid = net_uint16 ((uint8 *)buf);
820 repeat = GetInt_String (buf + 2); 784 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
785
821 /* -1 is special - no repeat, but don't update */ 786 /* -1 is special - no repeat, but don't update */
822 if (repeat != -1) 787 if (repeat != -1)
823 {
824 pl->count = repeat; 788 pl->count = repeat;
825 }
826 if ((len - 4) >= MAX_BUF)
827 len = MAX_BUF - 5;
828 789
829 strncpy ((char *) command, (char *) buf + 6, len - 4); 790 buf += 6; //len -= 6;
830 command[len - 4] = '\0';
831 791
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
843 /* This should not happen anymore. */
844 if (pl->ob->speed_left < -1.0)
845 {
846 LOG (llevError, "Player has negative time - shouldn't do command.\n");
847 }
848 /* In c_new.c */
849 execute_newserver_command (pl->ob, (char *) command); 792 execute_newserver_command (pl->ob, buf);
793
850 /* Perhaps something better should be done with a left over count. 794 /* Perhaps something better should be done with a left over count.
851 * Cleaning up the input should probably be done first - all actions 795 * 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 796 * for the command that issued the count should be done before any other
853 * commands. 797 * commands.
854 */ 798 */
855 pl->count = 0; 799 pl->count = 0;
856 800
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
802 int time = FABS (pl->ob->speed) < 0.001
803 ? time = MAX_TIME * 100
804 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
805
857 /* Send confirmation of command execution now */ 806 /* Send confirmation of command execution now */
858 sl.buf = command; 807 packet sl ("comc");
859 strcpy ((char *) sl.buf, "comc "); 808 sl << uint16 (cmdid) << uint32 (time);
860 sl.len = 5; 809 pl->ns->send_packet (sl);
861 SockList_AddShort (&sl, packet);
862 if (FABS (pl->ob->speed) < 0.001)
863 time = MAX_TIME * 100;
864 else
865 time = (int) (MAX_TIME / FABS (pl->ob->speed));
866 SockList_AddInt (&sl, time);
867 Send_With_Handling (&pl->socket, &sl);
868} 810}
869
870 811
871/** This is a reply to a previous query. */ 812/** This is a reply to a previous query. */
872void 813void
873ReplyCmd (char *buf, int len, player *pl) 814ReplyCmd (char *buf, int len, client *ns)
874{ 815{
816 if (ns->state == ST_CUSTOM)
817 {
818 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
819 return;
820 }
821
822 if (!ns->pl)
823 return; //TODO: depends on the exact reply we are after
824 //TODO: but right now, we always have a ns->pl
825
826 player *pl = ns->pl;
827
875 /* This is to synthesize how the data would be stored if it 828 /* This is to synthesize how the data would be stored if it
876 * was normally entered. A bit of a hack, and should be cleaned up 829 * was normally entered. A bit of a hack, and should be cleaned up
877 * once all the X11 code is removed from the server. 830 * once all the X11 code is removed from the server.
878 * 831 *
879 * We pass 13 to many of the functions because this way they 832 * We pass 13 to many of the functions because this way they
880 * think it was the carriage return that was entered, and the 833 * think it was the carriage return that was entered, and the
881 * function then does not try to do additional input. 834 * function then does not try to do additional input.
882 */ 835 */
883 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
884 837
885 /* this avoids any hacking here */ 838 /* this avoids any hacking here */
886 839
887 switch (pl->state) 840 switch (ns->state)
888 { 841 {
889 case ST_PLAYING: 842 case ST_PLAYING:
890 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 843 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
891 break; 844 break;
892 845
893 case ST_PLAY_AGAIN:
894 /* We can check this for return value (2==quit). Maybe we
895 * should, and do something appropriate?
896 */
897 receive_play_again (pl->ob, buf[0]);
898 break;
899
900 case ST_ROLL_STAT:
901 key_roll_stat (pl->ob, buf[0]);
902 break;
903
904 case ST_CHANGE_CLASS: 846 case ST_CHANGE_CLASS:
905
906 key_change_class (pl->ob, buf[0]); 847 key_change_class (pl->ob, buf[0]);
907 break; 848 break;
908 849
909 case ST_CONFIRM_QUIT: 850 case ST_CONFIRM_QUIT:
910 key_confirm_quit (pl->ob, buf[0]); 851 key_confirm_quit (pl->ob, buf[0]);
911 break; 852 break;
912 853
913 case ST_CONFIGURE:
914 LOG (llevError, "In client input handling, but into configure state\n");
915 pl->state = ST_PLAYING;
916 break;
917
918 case ST_GET_NAME:
919 receive_player_name (pl->ob, 13);
920 break;
921
922 case ST_GET_PASSWORD:
923 case ST_CONFIRM_PASSWORD:
924 receive_player_password (pl->ob, 13);
925 break;
926
927 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 854 case ST_GET_PARTY_PASSWORD: /* Get password for party */
928 receive_party_password (pl->ob, 13); 855 receive_party_password (pl->ob, 13);
929 break; 856 break;
930 857
931 default: 858 default:
932 LOG (llevError, "Unknown input state: %d\n", pl->state); 859 LOG (llevError, "Unknown input state: %d\n", ns->state);
933 } 860 }
934} 861}
935 862
936/** 863/**
937 * Client tells its version. If there is a mismatch, we close the 864 * Client tells its version. If there is a mismatch, we close the
… …
939 * something older than the server. If we assume the client will be 866 * 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 867 * backwards compatible, having it be a later version should not be a
941 * problem. 868 * problem.
942 */ 869 */
943void 870void
944VersionCmd (char *buf, int len, NewSocket * ns) 871VersionCmd (char *buf, int len, client * ns)
945{ 872{
946 char *cp;
947 char version_warning[256];
948
949 if (!buf) 873 if (!buf)
950 { 874 {
951 LOG (llevError, "CS: received corrupted version command\n"); 875 LOG (llevError, "CS: received corrupted version command\n");
952 return; 876 return;
953 } 877 }
954 878
955 ns->cs_version = atoi (buf); 879 ns->cs_version = atoi (buf);
956 ns->sc_version = ns->cs_version; 880 ns->sc_version = ns->cs_version;
881
882 LOG (llevDebug, "connection from client <%s>\n", buf);
883
884
885 //TODO: should log here just for statistics
886
957 if (VERSION_CS != ns->cs_version) 887 //if (VERSION_CS != ns->cs_version)
958 { 888 // unchecked;
959#ifdef ESRV_DEBUG 889
960 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
961#endif
962 }
963 cp = strchr (buf + 1, ' '); 890 char *cp = strchr (buf + 1, ' ');
964 if (!cp) 891 if (!cp)
965 return; 892 return;
893
966 ns->sc_version = atoi (cp); 894 ns->sc_version = atoi (cp);
895
967 if (VERSION_SC != ns->sc_version) 896 //if (VERSION_SC != ns->sc_version)
968 { 897 // unchecked;
969#ifdef ESRV_DEBUG 898
970 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
971#endif
972 }
973 cp = strchr (cp + 1, ' '); 899 cp = strchr (cp + 1, ' ');
900
974 if (cp) 901 if (cp)
975 { 902 {
976 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 903 assign (ns->version, cp + 1);
977 904
978 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 905 if (ns->sc_version < 1026)
979 906 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
980 /* This is first implementation - i skip all beta DX clients with it
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 {
991 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
992 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 907 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
993 Write_String_To_Socket (ns, version_warning, strlen (version_warning));
994 }
995
996 } 908 }
997} 909}
998 910
999/** sound related functions. */ 911/** sound related functions. */
1000
1001void 912void
1002SetSound (char *buf, int len, NewSocket * ns) 913SetSound (char *buf, int len, client * ns)
1003{ 914{
1004 ns->sound = atoi (buf); 915 ns->sound = atoi (buf);
1005} 916}
1006 917
1007/** client wants the map resent */ 918/** client wants the map resent */
1008 919
1009void 920void
1010MapRedrawCmd (char *buf, int len, player *pl) 921MapRedrawCmd (char *buf, int len, player *pl)
1011{ 922{
1012
1013/* This function is currently disabled; just clearing the map state results in 923/* This function is currently disabled; just clearing the map state results in
1014 * display errors. It should clear the cache and send a newmap command. 924 * display errors. It should clear the cache and send a newmap command.
1015 * Unfortunately this solution does not work because some client versions send 925 * Unfortunately this solution does not work because some client versions send
1016 * a mapredraw command after receiving a newmap command. 926 * a mapredraw command after receiving a newmap command.
1017 */ 927 */
1018#if 0
1019 /* Okay, this is MAJOR UGLY. but the only way I know how to
1020 * clear the "cache"
1021 */
1022 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1023 draw_client_map (pl->ob);
1024#endif
1025} 928}
1026 929
1027/** 930/**
1028 * Moves an object (typically, container to inventory). 931 * Moves an object (typically, container to inventory).
1029 * syntax is: move (to) (tag) (nrof) 932 * syntax is: move (to) (tag) (nrof)
… …
1032MoveCmd (char *buf, int len, player *pl) 935MoveCmd (char *buf, int len, player *pl)
1033{ 936{
1034 int vals[3], i; 937 int vals[3], i;
1035 938
1036 /* A little funky here. We only cycle for 2 records, because 939 /* A little funky here. We only cycle for 2 records, because
1037 * we obviously am not going to find a space after the third 940 * we obviously are not going to find a space after the third
1038 * record. Perhaps we should just replace this with a 941 * record. Perhaps we should just replace this with a
1039 * sscanf? 942 * sscanf?
1040 */ 943 */
1041 for (i = 0; i < 2; i++) 944 for (i = 0; i < 2; i++)
1042 { 945 {
1043 vals[i] = atoi (buf); 946 vals[i] = atoi (buf);
947
1044 if (!(buf = strchr (buf, ' '))) 948 if (!(buf = strchr (buf, ' ')))
1045 { 949 {
1046 LOG (llevError, "Incomplete move command: %s\n", buf); 950 LOG (llevError, "Incomplete move command: %s\n", buf);
1047 return; 951 return;
1048 } 952 }
953
1049 buf++; 954 buf++;
1050 } 955 }
956
1051 vals[2] = atoi (buf); 957 vals[2] = atoi (buf);
1052 958
1053/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 959/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1054 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 960 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1055} 961}
1056
1057
1058 962
1059/****************************************************************************** 963/******************************************************************************
1060 * 964 *
1061 * Start of commands the server sends to the client. 965 * Start of commands the server sends to the client.
1062 * 966 *
… …
1065/** 969/**
1066 * Asks the client to query the user. This way, the client knows 970 * 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) 971 * it needs to send something back (vs just printing out a message)
1068 */ 972 */
1069void 973void
1070send_query (NewSocket * ns, uint8 flags, char *text) 974send_query (client *ns, uint8 flags, char *text)
1071{ 975{
1072 char buf[MAX_BUF];
1073
1074 sprintf (buf, "query %d %s", flags, text ? text : ""); 976 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1075 Write_String_To_Socket (ns, buf, strlen (buf));
1076} 977}
1077 978
1078#define AddIfInt64(Old,New,Type) if (Old != New) {\ 979#define AddIfInt64(Old,New,Type) if (Old != New) {\
1079 Old = New; \ 980 Old = New; \
1080 SockList_AddChar(&sl, Type); \ 981 sl << uint8 (Type) << uint64 (New); \
1081 SockList_AddInt64(&sl, New); \
1082 } 982 }
1083 983
1084#define AddIfInt(Old,New,Type) if (Old != New) {\ 984#define AddIfInt(Old,New,Type) if (Old != New) {\
1085 Old = New; \ 985 Old = New; \
1086 SockList_AddChar(&sl, Type); \ 986 sl << uint8 (Type) << uint32 (New); \
1087 SockList_AddInt(&sl, New); \
1088 } 987 }
1089 988
1090#define AddIfShort(Old,New,Type) if (Old != New) {\ 989#define AddIfShort(Old,New,Type) if (Old != New) {\
1091 Old = New; \ 990 Old = New; \
1092 SockList_AddChar(&sl, Type); \ 991 sl << uint8 (Type) << uint16 (New); \
1093 SockList_AddShort(&sl, New); \
1094 } 992 }
1095 993
1096#define AddIfFloat(Old,New,Type) if (Old != New) {\ 994#define AddIfFloat(Old,New,Type) if (Old != New) {\
1097 Old = New; \ 995 Old = New; \
1098 SockList_AddChar(&sl, Type); \ 996 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1099 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1100 } 997 }
1101 998
1102#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 999#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1103 if (Old) free(Old);\
1104 Old = strdup_local(New);\ 1000 free(Old); Old = strdup (New);\
1105 SockList_AddChar(&sl, Type); \ 1001 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 } 1002 }
1110 1003
1111/** 1004/**
1112 * Sends a statistics update. We look at the old values, 1005 * Sends a statistics update. We look at the old values,
1113 * and only send what has changed. Stat mapping values are in newclient.h 1006 * and only send what has changed. Stat mapping values are in newclient.h
… …
1115 * commands for now. 1008 * commands for now.
1116 */ 1009 */
1117void 1010void
1118esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1119{ 1012{
1120 SockList sl;
1121 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1122 uint16 flags; 1014 uint16 flags;
1123 1015
1124 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1016 if (!pl->ns)
1125 strcpy ((char *) sl.buf, "stats "); 1017 return;
1126 sl.len = strlen ((char *) sl.buf);
1127 1018
1019 packet sl ("stats");
1020
1128 if (pl->ob != NULL) 1021 if (pl->ob)
1129 { 1022 {
1130 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1023 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); 1024 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1132 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1025 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1133 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1026 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1134 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1027 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1135 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1028 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1136 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1029 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1137 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1138 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1139 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); 1030 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); 1031 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1032 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1142 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1143 } 1036 }
1144 if (pl->socket.exp64)
1145 {
1146 uint8 s;
1147 1037
1148 for (s = 0; s < NUM_SKILLS; s++) 1038 for (int s = 0; s < NUM_SKILLS; s++)
1149 {
1150 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1039 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1151 { 1040 {
1152
1153 /* Always send along the level if exp changes. This is only 1041 /* Always send along the level if exp changes. This is only
1154 * 1 extra byte, but keeps processing simpler. 1042 * 1 extra byte, but keeps processing simpler.
1155 */ 1043 */
1156 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1044 sl << uint8 (s + CS_STAT_SKILLINFO)
1157 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1045 << uint8 (pl->last_skill_ob[s]->level)
1158 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1046 << uint64 (pl->last_skill_ob[s]->stats.exp);
1047
1159 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1048 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1160 }
1161 } 1049 }
1162 } 1050
1163 if (pl->socket.exp64)
1164 {
1165 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1051 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1166 }
1167 else
1168 {
1169 AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP);
1170 }
1171 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1052 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1172 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1053 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); 1054 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); 1055 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1175 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1056 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1176 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1057 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); 1058 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); 1059 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1179 flags = 0; 1060 flags = 0;
1061
1180 if (pl->fire_on) 1062 if (pl->fire_on)
1181 flags |= SF_FIREON; 1063 flags |= SF_FIREON;
1064
1182 if (pl->run_on) 1065 if (pl->run_on)
1183 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1184 1067
1185 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1069
1186 if (pl->socket.sc_version < 1025) 1070 if (pl->ns->sc_version < 1025)
1187 {
1188 AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1071 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1189 }
1190 else 1072 else
1191 {
1192 int i;
1193
1194 for (i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1195 { 1074 {
1196 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
1197 if (atnr_cs_stat[i] == -1) 1076 if (atnr_cs_stat[i] == -1)
1198 continue; 1077 continue;
1078
1199 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1079 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1200 } 1080 }
1201 } 1081
1202 if (pl->socket.monitor_spells) 1082 if (pl->ns->monitor_spells)
1203 { 1083 {
1204 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1084 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); 1085 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); 1086 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1207 } 1087 }
1088
1208 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1089 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); 1090 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1210 set_title (pl->ob, buf); 1091 set_title (pl->ob, buf);
1211 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1212 1093
1213 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1214 if (sl.len > 6) 1095 if (sl.length () > 6)
1215 { 1096 pl->ns->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} 1097}
1223
1224 1098
1225/** 1099/**
1226 * Tells the client that here is a player it should start using. 1100 * Tells the client that here is a player it should start using.
1227 */ 1101 */
1228void 1102void
1229esrv_new_player (player *pl, uint32 weight) 1103esrv_new_player (player *pl, uint32 weight)
1230{ 1104{
1231 SockList sl;
1232
1233 pl->last_weight = weight; 1105 pl->last_weight = weight;
1234 1106
1235 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1107 packet sl ("player");
1236 1108
1237 strcpy ((char *) sl.buf, "player "); 1109 sl << uint32 (pl->ob->count)
1238 sl.len = strlen ((char *) sl.buf); 1110 << uint32 (weight)
1239 SockList_AddInt (&sl, pl->ob->count); 1111 << uint32 (pl->ob->face->number)
1240 SockList_AddInt (&sl, weight); 1112 << data8 (pl->ob->name);
1241 SockList_AddInt (&sl, pl->ob->face->number);
1242 1113
1243 SockList_AddChar (&sl, (char) strlen (pl->ob->name)); 1114 pl->ns->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); 1115 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1250} 1116}
1251
1252 1117
1253/** 1118/**
1254 * Need to send an animation sequence to the client. 1119 * Need to send an animation sequence to the client.
1255 * We will send appropriate face commands to the client if we haven't 1120 * 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 1121 * 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 1122 * how much we are sending - on the other hand, this should only happen
1258 * when the player logs in and picks stuff up. 1123 * when the player logs in and picks stuff up.
1259 */ 1124 */
1260void 1125void
1261esrv_send_animation (NewSocket * ns, short anim_num) 1126esrv_send_animation (client * ns, short anim_num)
1262{ 1127{
1263 SockList sl;
1264 int i;
1265
1266 /* Do some checking on the anim_num we got. Note that the animations 1128 /* 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 1129 * are added in contigous order, so if the number is in the valid
1268 * range, it must be a valid animation. 1130 * range, it must be a valid animation.
1269 */ 1131 */
1270 if (anim_num < 0 || anim_num > num_animations) 1132 if (anim_num < 0 || anim_num > num_animations)
1271 { 1133 {
1272 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1134 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1273 return; 1135 return;
1274 } 1136 }
1275 1137
1276 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1138 packet sl ("anim");
1277 strcpy ((char *) sl.buf, "anim "); 1139
1278 sl.len = 5; 1140 sl << uint16 (anim_num)
1279 SockList_AddShort (&sl, anim_num); 1141 << uint16 (0); /* flags - not used right now */
1280 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1142
1281 /* Build up the list of faces. Also, send any information (ie, the 1143 /* Build up the list of faces. Also, send any information (ie, the
1282 * the face itself) down to the client. 1144 * the face itself) down to the client.
1283 */ 1145 */
1284 for (i = 0; i < animations[anim_num].num_animations; i++) 1146 for (int i = 0; i < animations[anim_num].num_animations; i++)
1285 { 1147 {
1286 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1148 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1287 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1149 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1150
1288 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1151 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1289 } 1152 }
1290 Send_With_Handling (ns, &sl); 1153
1291 free (sl.buf); 1154 ns->send_packet (sl);
1155
1292 ns->anims_sent[anim_num] = 1; 1156 ns->anims_sent[anim_num] = 1;
1293} 1157}
1294 1158
1295 1159
1296/****************************************************************************** 1160/******************************************************************************
… …
1302/** 1166/**
1303 * This adds face_num to a map cell at x,y. If the client doesn't have 1167 * 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. 1168 * the face yet, we will also send it.
1305 */ 1169 */
1306static void 1170static void
1307esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1171esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1308{ 1172{
1309 if (newmap->cells[x][y].count >= MAP_LAYERS) 1173 if (newmap->cells[x][y].count >= MAP_LAYERS)
1310 { 1174 {
1175 //TODO: one or the other, can't both have abort and return, verify and act
1311 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1176 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1312 return; 1177 return;
1313 abort (); 1178 abort ();
1314 } 1179 }
1180
1315 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1181 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1316 newmap->cells[x][y].count++; 1182 newmap->cells[x][y].count++;
1183
1317 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1184 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1318 esrv_send_face (ns, face_num, 0); 1185 esrv_send_face (ns, face_num, 0);
1319} 1186}
1320
1321struct LayerCell
1322{
1323 uint16 xy;
1324 short face;
1325};
1326
1327struct MapLayer
1328{
1329 int count;
1330 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1331};
1332
1333/** Checkes if map cells have changed */
1334static int
1335mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1336{
1337 int k;
1338
1339 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1340 return 1;
1341 for (k = 0; k < newmap->cells[i][j].count; k++)
1342 {
1343 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1344 {
1345 return 1;
1346 }
1347 }
1348 return 0;
1349}
1350
1351/**
1352 * Basically, what this does is pack the data into layers.
1353 * 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
1355 * how many layers of data we should back.
1356 */
1357static uint8 *
1358compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1359{
1360 int x, y, k;
1361 int face;
1362 unsigned char *fcur;
1363 struct MapLayer layers[MAP_LAYERS];
1364
1365 for (k = 0; k < MAP_LAYERS; k++)
1366 layers[k].count = 0;
1367 fcur = cur;
1368 for (x = 0; x < ns->mapx; x++)
1369 {
1370 for (y = 0; y < ns->mapy; y++)
1371 {
1372 if (!mapcellchanged (ns, x, y, newmap))
1373 continue;
1374 if (newmap->cells[x][y].count == 0)
1375 {
1376 *cur = x * ns->mapy + y; /* mark empty space */
1377 cur++;
1378 continue;
1379 }
1380 for (k = 0; k < newmap->cells[x][y].count; k++)
1381 {
1382 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1383 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1384 layers[k].count++;
1385 }
1386 }
1387 }
1388 /* If no data, return now. */
1389 if (fcur == cur && layers[0].count == 0)
1390 return cur;
1391 *cur = 255; /* mark end of explicitly cleared cells */
1392 cur++;
1393 /* First pack by layers. */
1394 for (k = 0; k < numlayers; k++)
1395 {
1396 if (layers[k].count == 0)
1397 break; /* once a layer is entirely empty, no layer below it can
1398 have anything in it either */
1399 /* Pack by entries in thie layer */
1400 for (x = 0; x < layers[k].count;)
1401 {
1402 fcur = cur;
1403 *cur = layers[k].lcells[x].face >> 8;
1404 cur++;
1405 *cur = layers[k].lcells[x].face & 0xFF;
1406 cur++;
1407 face = layers[k].lcells[x].face;
1408 /* Now, we back the redundant data into 1 byte xy pairings */
1409 for (y = x; y < layers[k].count; y++)
1410 {
1411 if (layers[k].lcells[y].face == face)
1412 {
1413 *cur = (uint8) layers[k].lcells[y].xy;
1414 cur++;
1415 layers[k].lcells[y].face = -1;
1416 }
1417 }
1418 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1419 /* forward over the now redundant data */
1420 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1421 x++;
1422 }
1423 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1424 }
1425 return cur;
1426}
1427
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 1187
1464/** Clears a map cell */ 1188/** Clears a map cell */
1465static void 1189static void
1466map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1190map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1467{ 1191{
1468 cell->faces[0] = face0; 1192 cell->faces[0] = face0;
1469 cell->faces[1] = face1; 1193 cell->faces[1] = face1;
1470 cell->faces[2] = face2; 1194 cell->faces[2] = face2;
1471 cell->count = count; 1195 cell->count = count;
1472 cell->stat_hp = 0; 1196 cell->stat_hp = 0;
1197 cell->flags = 0;
1473 cell->player = 0; 1198 cell->player = 0;
1474} 1199}
1475 1200
1476#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1201#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1477#define MAX_LAYERS 3 1202#define MAX_LAYERS 3
1478 1203
1479/* Using a global really isn't a good approach, but saves the over head of 1204/* Using a global really isn't a good approach, but saves the over head of
1480 * allocating and deallocating such a block of data each time run through, 1205 * allocating and deallocating such a block of data each time run through,
1481 * and saves the space of allocating this in the socket object when we only 1206 * and saves the space of allocating this in the socket object when we only
1482 * need it for this cycle. If the serve is ever threaded, this needs to be 1207 * need it for this cycle. If the server is ever threaded, this needs to be
1483 * re-examined. 1208 * re-examined.
1484 */ 1209 */
1485
1486static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1210static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1487 1211
1488/** 1212/**
1489 * Returns true if any of the heads for this 1213 * Returns true if any of the heads for this
1490 * space is set. Returns false if all are blank - this is used 1214 * space is set. Returns false if all are blank - this is used
1491 * for empty space checking. 1215 * for empty space checking.
1492 */ 1216 */
1493static inline int 1217static inline int
1494have_head (int ax, int ay) 1218have_head (int ax, int ay)
1495{ 1219{
1496
1497 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1498 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1221 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1499 return 1; 1222 return 1;
1223
1500 return 0; 1224 return 0;
1501} 1225}
1502 1226
1503/** 1227/**
1504 * check_head is a bit simplistic version of update_space below. 1228 * check_head is a bit simplistic version of update_space below.
1505 * basically, it only checks the that the head on space ax,ay at layer 1229 * basically, it only checks the that the head on space ax,ay at layer
1506 * needs to get sent - if so, it adds the data, sending the head 1230 * 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 1231 * if needed, and returning 1. If this no data needs to get
1508 * sent, it returns zero. 1232 * sent, it returns zero.
1509 */ 1233 */
1510static int 1234static int
1511check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1235check_head (packet &sl, client &ns, int ax, int ay, int layer)
1512{ 1236{
1513 short face_num; 1237 short face_num;
1514 1238
1515 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1239 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1516 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1240 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1517 else 1241 else
1518 face_num = 0; 1242 face_num = 0;
1519 1243
1520 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1244 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1521 { 1245 {
1522 SockList_AddShort (&sl, face_num); 1246 sl << uint16 (face_num);
1523 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1247 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1524 esrv_send_face (&ns, face_num, 0); 1248 esrv_send_face (&ns, face_num, 0);
1249
1525 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1250 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1526 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1251 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1527 return 1; 1252 return 1;
1528 } 1253 }
1529 1254
… …
1547 * numbers the spaces differently - I think this was a leftover from 1272 * numbers the spaces differently - I think this was a leftover from
1548 * the map command, where the faces stack up. Sinces that is no longer 1273 * the map command, where the faces stack up. Sinces that is no longer
1549 * the case, it seems to make more sense to have these layer values 1274 * the case, it seems to make more sense to have these layer values
1550 * actually match. 1275 * actually match.
1551 */ 1276 */
1552
1553static int 1277static int
1554update_space (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1278update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1555{ 1279{
1556 object *ob, *head; 1280 object *ob, *head;
1557 uint16 face_num; 1281 uint16 face_num;
1558 int bx, by, i; 1282 int bx, by, i;
1559 1283
1560 /* If there is a multipart object stored away, treat that as more important. 1284 /* If there is a multipart object stored away, treat that as more important.
1561 * If not, then do the normal processing. 1285 * If not, then do the normal processing.
1562 */ 1286 */
1563
1564 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1287 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1565 1288
1566 /* Check to see if this head is part of the set of objects 1289 /* Check to see if this head is part of the set of objects
1567 * we would normally send for this space. If so, then 1290 * we would normally send for this space. If so, then
1568 * don't use the head value. We need to do the check 1291 * don't use the head value. We need to do the check
… …
1733 1456
1734 /* Another hack - because of heads and whatnot, this face may match one 1457 /* 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 1458 * we already sent for a lower layer. In that case, don't send
1736 * this one. 1459 * this one.
1737 */ 1460 */
1738 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) 1461 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1739 {
1740 face_num = 0; 1462 face_num = 0;
1741 }
1742 1463
1743 /* We've gotten what face we want to use for the object. Now see if 1464 /* 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. 1465 * if it has changed since we last sent it to the client.
1745 */ 1466 */
1746 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1467 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1747 { 1468 {
1748 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1469 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1749 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1470 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1750 esrv_send_face (ns, face_num, 0); 1471 esrv_send_face (&ns, face_num, 0);
1751 SockList_AddShort (sl, face_num); 1472
1473 sl << uint16 (face_num);
1752 return 1; 1474 return 1;
1753 } 1475 }
1476
1754 /* Nothing changed */ 1477 /* Nothing changed */
1755 return 0; 1478 return 0;
1756} 1479}
1757 1480
1758/** 1481/**
… …
1773 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1496 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1774 * take. 1497 * take.
1775 */ 1498 */
1776 1499
1777static inline int 1500static inline int
1778update_smooth (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1501update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1779{ 1502{
1780 object *ob; 1503 object *ob;
1781 int smoothlevel; /* old face_num; */ 1504 int smoothlevel; /* old face_num; */
1782 1505
1783 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1784 1507
1785 /* If there is no object for this space, or if the face for the object 1508 /* If there is no object for this space, or if the face for the object
1786 * is the blank face, set the smoothlevel to zero. 1509 * is the blank face, set the smoothlevel to zero.
1787 */ 1510 */
1788 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1511 if (!ob || ob->face == blank_face || mp->nosmooth)
1789 smoothlevel = 0; 1512 smoothlevel = 0;
1790 else 1513 else
1791 { 1514 {
1792 smoothlevel = ob->smoothlevel; 1515 smoothlevel = ob->smoothlevel;
1793 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1794 SendSmooth (ns, ob->face->number); 1517 SendSmooth (&ns, ob->face->number);
1795 } /* else not already head object or blank face */ 1518 } /* else not already head object or blank face */
1796 1519
1797 /* We've gotten what face we want to use for the object. Now see if 1520 /* 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. 1521 * if it has changed since we last sent it to the client.
1799 */ 1522 */
1800 if (smoothlevel > 255) 1523 if (smoothlevel > 255)
1801 smoothlevel = 255; 1524 smoothlevel = 255;
1802 else if (smoothlevel < 0) 1525 else if (smoothlevel < 0)
1803 smoothlevel = 0; 1526 smoothlevel = 0;
1527
1804 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1528 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1805 { 1529 {
1806 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1530 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1807 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1531 sl << uint8 (smoothlevel);
1808 return 1; 1532 return 1;
1809 } 1533 }
1534
1810 /* Nothing changed */ 1535 /* Nothing changed */
1811 return 0; 1536 return 0;
1812} 1537}
1813 1538
1814/** 1539/**
1815 * Returns the size of a data for a map square as returned by 1540 * Returns the size of a data for a map square as returned by
1816 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1541 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1817 * available. 1542 * available.
1818 */ 1543 */
1819int 1544int
1820getExtendedMapInfoSize (NewSocket * ns) 1545getExtendedMapInfoSize (client * ns)
1821{ 1546{
1822 int result = 0; 1547 int result = 0;
1823 1548
1824 if (ns->ext_mapinfos) 1549 if (ns->ext_mapinfos)
1825 { 1550 {
1826 if (ns->EMI_smooth) 1551 if (ns->EMI_smooth)
1827 result += 1; /*One byte for smoothlevel */ 1552 result += 1; /*One byte for smoothlevel */
1828 } 1553 }
1554
1829 return result; 1555 return result;
1830} 1556}
1831 1557
1832/** 1558/**
1833 * This function uses the new map1 protocol command to send the map 1559 * This function uses the new map1 protocol command to send the map
… …
1840 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1566 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1841 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1567 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1842 * and use the other 4 bits for other informatiion. For full documentation 1568 * and use the other 4 bits for other informatiion. For full documentation
1843 * of what we send, see the doc/Protocol file. 1569 * of what we send, see the doc/Protocol file.
1844 * I will describe internally what we do: 1570 * I will describe internally what we do:
1845 * the socket->lastmap shows how the map last looked when sent to the client. 1571 * the ns->lastmap shows how the map last looked when sent to the client.
1846 * in the lastmap structure, there is a cells array, which is set to the 1572 * in the lastmap structure, there is a cells array, which is set to the
1847 * maximum viewable size (As set in config.h). 1573 * maximum viewable size (As set in config.h).
1848 * in the cells, there are faces and a count value. 1574 * in the cells, there are faces and a count value.
1849 * we use the count value to hold the darkness value. If -1, then this space 1575 * we use the count value to hold the darkness value. If -1, then this space
1850 * is not viewable. 1576 * is not viewable.
… …
1855draw_client_map1 (object *pl) 1581draw_client_map1 (object *pl)
1856{ 1582{
1857 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1583 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1858 sint16 nx, ny; 1584 sint16 nx, ny;
1859 int estartlen, eoldlen; 1585 int estartlen, eoldlen;
1860 SockList sl;
1861 SockList esl; /*For extended Map info */
1862 uint16 mask, emask; 1586 uint16 mask, emask;
1863 uint8 eentrysize; 1587 uint8 eentrysize;
1864 uint16 ewhatstart, ewhatflag; 1588 uint16 ewhatstart, ewhatflag;
1865 uint8 extendedinfos; 1589 uint8 extendedinfos;
1866 mapstruct *m; 1590 maptile *m;
1867 1591
1868 NewSocket & socket = pl->contr->socket; 1592 client &socket = *pl->contr->ns;
1869 1593
1870 check_map_change (pl->contr); 1594 check_map_change (pl->contr);
1871 1595
1872 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1596 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1873 if (socket.mapmode == Map1Cmd) 1597 packet esl;
1874 strcpy ((char *) sl.buf, "map1 "); 1598
1875 else
1876 strcpy ((char *) sl.buf, "map1a ");
1877 sl.len = strlen ((char *) sl.buf);
1878 startlen = sl.len; 1599 startlen = sl.length ();
1600
1879 /*Extendedmapinfo structure initialisation */ 1601 /*Extendedmapinfo structure initialisation */
1880 if (socket.ext_mapinfos) 1602 if (socket.ext_mapinfos)
1881 { 1603 {
1882 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1883 strcpy ((char *) esl.buf, "mapextended ");
1884 esl.len = strlen ((char *) esl.buf);
1885 extendedinfos = EMI_NOREDRAW; 1604 extendedinfos = EMI_NOREDRAW;
1605
1886 if (socket.EMI_smooth) 1606 if (socket.EMI_smooth)
1887 extendedinfos |= EMI_SMOOTH; 1607 extendedinfos |= EMI_SMOOTH;
1608
1888 ewhatstart = esl.len; 1609 ewhatstart = esl.length ();
1889 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1610 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1890 could need to be taken away */ 1611 could need to be taken away */
1891 SockList_AddChar (&esl, extendedinfos);
1892 eentrysize = getExtendedMapInfoSize (&socket); 1612 eentrysize = getExtendedMapInfoSize (&socket);
1893 SockList_AddChar (&esl, eentrysize); 1613 esl << "mapextended "
1614 << uint8 (extendedinfos)
1615 << uint8 (eentrysize);
1616
1894 estartlen = esl.len; 1617 estartlen = esl.length ();
1895 } 1618 }
1896 else 1619 else
1897 { 1620 {
1898 /* suppress compiler warnings */ 1621 /* suppress compiler warnings */
1899 ewhatstart = 0; 1622 ewhatstart = 0;
1900 ewhatflag = 0; 1623 ewhatflag = 0;
1901 estartlen = 0; 1624 estartlen = 0;
1902 } 1625 }
1626
1903 /* Init data to zero */ 1627 /* Init data to zero */
1904 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1628 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1905 1629
1906 /* x,y are the real map locations. ax, ay are viewport relative 1630 /* x,y are the real map locations. ax, ay are viewport relative
1907 * locations. 1631 * locations.
… …
1911 /* We could do this logic as conditionals in the if statement, 1635 /* We could do this logic as conditionals in the if statement,
1912 * but that started to get a bit messy to look at. 1636 * but that started to get a bit messy to look at.
1913 */ 1637 */
1914 max_x = pl->x + (socket.mapx + 1) / 2; 1638 max_x = pl->x + (socket.mapx + 1) / 2;
1915 max_y = pl->y + (socket.mapy + 1) / 2; 1639 max_y = pl->y + (socket.mapy + 1) / 2;
1640
1916 if (socket.mapmode == Map1aCmd) 1641 if (socket.mapmode == Map1aCmd)
1917 { 1642 {
1918 max_x += MAX_HEAD_OFFSET; 1643 max_x += MAX_HEAD_OFFSET;
1919 max_y += MAX_HEAD_OFFSET; 1644 max_y += MAX_HEAD_OFFSET;
1920 } 1645 }
… …
1922 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1647 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1923 { 1648 {
1924 ax = 0; 1649 ax = 0;
1925 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1650 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1926 { 1651 {
1927
1928 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1652 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1929 1653
1930 /* If this space is out of the normal viewable area, we only check 1654 /* If this space is out of the normal viewable area, we only check
1931 * the heads value ax or ay will only be greater than what 1655 * the heads value ax or ay will only be greater than what
1932 * the client wants if using the map1a command - this is because 1656 * the client wants if using the map1a command - this is because
… …
1935 */ 1659 */
1936 if (ax >= socket.mapx || ay >= socket.mapy) 1660 if (ax >= socket.mapx || ay >= socket.mapy)
1937 { 1661 {
1938 int i, got_one; 1662 int i, got_one;
1939 1663
1940 oldlen = sl.len; 1664 oldlen = sl.length ();
1941 1665
1942 SockList_AddShort (&sl, mask); 1666 sl << uint16 (mask);
1943 1667
1944 if (check_head (sl, socket, ax, ay, 2)) 1668 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1945 mask |= 0x4;
1946 if (check_head (sl, socket, ax, ay, 1)) 1669 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1947 mask |= 0x2;
1948 if (check_head (sl, socket, ax, ay, 0)) 1670 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1949 mask |= 0x1;
1950 1671
1951 /* If all we are doing is sending 0 (blank) faces, we don't 1672 /* If all we are doing is sending 0 (blank) faces, we don't
1952 * actually need to send that - just the coordinates 1673 * actually need to send that - just the coordinates
1953 * with no faces tells the client to blank out the 1674 * with no faces tells the client to blank out the
1954 * space. 1675 * space.
1955 */ 1676 */
1956 got_one = 0; 1677 got_one = 0;
1957 for (i = oldlen + 2; i < sl.len; i++) 1678 for (i = oldlen + 2; i < sl.length (); i++)
1958 {
1959 if (sl.buf[i]) 1679 if (sl[i])
1960 got_one = 1; 1680 got_one = 1;
1961 }
1962 1681
1963 if (got_one && (mask & 0xf)) 1682 if (got_one && (mask & 0xf))
1964 {
1965 sl.buf[oldlen + 1] = mask & 0xff; 1683 sl[oldlen + 1] = mask & 0xff;
1966 }
1967 else 1684 else
1968 { /*either all faces blank, either no face at all */ 1685 { /*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 */ 1686 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1970 sl.len = oldlen + 2; 1687 sl.reset (oldlen + 2);
1971 else 1688 else
1972 sl.len = oldlen; 1689 sl.reset (oldlen);
1973 } 1690 }
1691
1974 /*What concerns extendinfos, nothing to be done for now 1692 /*What concerns extendinfos, nothing to be done for now
1975 * (perhaps effects layer later) 1693 * (perhaps effects layer later)
1976 */ 1694 */
1977 continue; /* don't do processing below */ 1695 continue; /* don't do processing below */
1978 } 1696 }
1979 1697
1980 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1698 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1981 1699
1982 d = pl->contr->blocked_los[ax][ay]; 1700 d = pl->contr->blocked_los[ax][ay];
1983 1701
1984 /* If the coordinates are not valid, or it is too dark to see, 1702 /* If the coordinates are not valid, or it is too dark to see,
1985 * we tell the client as such 1703 * we tell the client as such
1986 */ 1704 */
1987 nx = x; 1705 nx = x;
1988 ny = y; 1706 ny = y;
1989 m = get_map_from_coord (pl->map, &nx, &ny); 1707 m = get_map_from_coord (pl->map, &nx, &ny);
1708
1990 if (!m) 1709 if (!m)
1991 { 1710 {
1992 /* space is out of map. Update space and clear values 1711 /* space is out of map. Update space and clear values
1993 * if this hasn't already been done. If the space is out 1712 * if this hasn't already been done. If the space is out
1994 * of the map, it shouldn't have a head 1713 * of the map, it shouldn't have a head
1995 */ 1714 */
1996 if (lastcell.count != -1) 1715 if (lastcell.count != -1)
1997 { 1716 {
1998 SockList_AddShort (&sl, mask); 1717 sl << uint16 (mask);
1999 map_clearcell (&lastcell, 0, 0, 0, -1); 1718 map_clearcell (&lastcell, 0, 0, 0, -1);
2000 } 1719 }
2001 } 1720 }
2002 else if (d > 3) 1721 else if (d > 3)
2003 { 1722 {
… …
2005 1724
2006 /* This block deals with spaces that are not visible for whatever 1725 /* This block deals with spaces that are not visible for whatever
2007 * reason. Still may need to send the head for this space. 1726 * reason. Still may need to send the head for this space.
2008 */ 1727 */
2009 1728
2010 oldlen = sl.len; 1729 oldlen = sl.length ();
2011 1730
2012 SockList_AddShort (&sl, mask); 1731 sl << uint16 (mask);
1732
2013 if (lastcell.count != -1) 1733 if (lastcell.count != -1)
2014 need_send = 1; 1734 need_send = 1;
1735
2015 count = -1; 1736 count = -1;
2016 1737
2017 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1738 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2018 { 1739 {
2019 /* Now check to see if any heads need to be sent */ 1740 /* Now check to see if any heads need to be sent */
2020 1741
2021 if (check_head (sl, socket, ax, ay, 2)) 1742 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2022 mask |= 0x4;
2023 if (check_head (sl, socket, ax, ay, 1)) 1743 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2024 mask |= 0x2;
2025 if (check_head (sl, socket, ax, ay, 0)) 1744 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2026 mask |= 0x1;
2027 1745
2028 lastcell.count = count; 1746 lastcell.count = count;
2029
2030 } 1747 }
2031 else 1748 else
2032 { 1749 {
2033 struct MapCell *cell = &lastcell;
2034
2035 /* properly clear a previously sent big face */ 1750 /* properly clear a previously sent big face */
2036 if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) 1751 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1752 || lastcell.stat_hp || lastcell.flags || lastcell.player)
2037 need_send = 1; 1753 need_send = 1;
1754
2038 map_clearcell (&lastcell, 0, 0, 0, count); 1755 map_clearcell (&lastcell, 0, 0, 0, count);
2039 } 1756 }
2040 1757
2041 if ((mask & 0xf) || need_send) 1758 if ((mask & 0xf) || need_send)
2042 {
2043 sl.buf[oldlen + 1] = mask & 0xff; 1759 sl[oldlen + 1] = mask & 0xff;
2044 }
2045 else 1760 else
2046 {
2047 sl.len = oldlen; 1761 sl.reset (oldlen);
2048 }
2049 } 1762 }
2050 else 1763 else
2051 { 1764 {
2052 /* In this block, the space is visible or there are head objects 1765 /* In this block, the space is visible or there are head objects
2053 * we need to send. 1766 * we need to send.
… …
2055 1768
2056 /* Rather than try to figure out what everything that we might 1769 /* Rather than try to figure out what everything that we might
2057 * need to send is, then form the packet after that, 1770 * need to send is, then form the packet after that,
2058 * we presume that we will in fact form a packet, and update 1771 * 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, 1772 * 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 1773 * we just back out sl.length () to the old value, and no harm
2061 * is done. 1774 * is done.
2062 * I think this is simpler than doing a bunch of checks to see 1775 * 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 1776 * what if anything we need to send, setting the bits, then
2064 * doing those checks again to add the real data. 1777 * doing those checks again to add the real data.
2065 */ 1778 */
2066 oldlen = sl.len; 1779 oldlen = sl.length ();
2067 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1780 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2068 eoldlen = esl.len; 1781 eoldlen = esl.length ();
2069 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1782 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2070 SockList_AddShort (&sl, mask); 1783 sl << uint16 (mask);
2071 1784
2072 if (socket.ext_mapinfos) 1785 if (socket.ext_mapinfos)
2073 SockList_AddShort (&esl, emask); 1786 esl << uint16 (emask);
2074 1787
2075 unsigned char dummy; 1788 unsigned char dummy;
2076 unsigned char *last_ext = &dummy; 1789 unsigned char *last_ext = &dummy;
2077 1790
2078 /* Darkness changed */ 1791 /* Darkness changed */
… …
2081 mask |= 0x8; 1794 mask |= 0x8;
2082 1795
2083 if (socket.extmap) 1796 if (socket.extmap)
2084 { 1797 {
2085 *last_ext |= 0x80; 1798 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 1799 last_ext = &sl[sl.length ()];
2087 SockList_AddChar (&sl, d); 1800 sl << uint8 (d);
2088 } 1801 }
2089 else 1802 else
2090 SockList_AddChar (&sl, 255 - 64 * d); 1803 sl << uint8 (255 - 64 * d);
2091 } 1804 }
2092 1805
2093 lastcell.count = d; 1806 lastcell.count = d;
2094 1807
2095 if (socket.extmap) 1808 if (socket.extmap)
2096 { 1809 {
2097 uint8 stat_hp = 0; 1810 uint8 stat_hp = 0;
2098 uint8 stat_width = 0; 1811 uint8 stat_width = 0;
1812 uint8 flags = 0;
2099 tag_t player = 0; 1813 UUID player = 0;
2100 1814
2101 // send hp information, if applicable 1815 // send hp information, if applicable
2102 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1816 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2103 { 1817 {
2104 if (op->head || op->invisible) 1818 if (op->head || op->invisible)
… …
2111 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1825 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2112 stat_width = op->arch->tail_x; 1826 stat_width = op->arch->tail_x;
2113 } 1827 }
2114 } 1828 }
2115 1829
1830 if (op->msg && op->msg[0] == '@')
1831 flags |= 1;
1832
2116 if (op->type == PLAYER && op != pl) 1833 if (op->type == PLAYER && op != pl)
2117 player = op->count; 1834 player = op->count;
2118 } 1835 }
2119 1836
2120 if (lastcell.stat_hp != stat_hp) 1837 if (lastcell.stat_hp != stat_hp)
2121 { 1838 {
2122 lastcell.stat_hp = stat_hp; 1839 lastcell.stat_hp = stat_hp;
2123 1840
2124 mask |= 0x8; 1841 mask |= 0x8;
2125 *last_ext |= 0x80; 1842 *last_ext |= 0x80;
2126 last_ext = sl.buf + sl.len; 1843 last_ext = &sl[sl.length ()];
2127 SockList_AddChar (&sl, 5); 1844
2128 SockList_AddChar (&sl, stat_hp); 1845 sl << uint8 (5) << uint8 (stat_hp);
2129 1846
2130 if (stat_width > 1) 1847 if (stat_width > 1)
2131 { 1848 {
2132 *last_ext |= 0x80; 1849 *last_ext |= 0x80;
2133 last_ext = sl.buf + sl.len; 1850 last_ext = &sl[sl.length ()];
2134 SockList_AddChar (&sl, 6); 1851
2135 SockList_AddChar (&sl, stat_width); 1852 sl << uint8 (6) << uint8 (stat_width);
2136 } 1853 }
2137 } 1854 }
2138 1855
2139 if (lastcell.player !=player) 1856 if (lastcell.player != player)
2140 { 1857 {
2141 lastcell.player = player; 1858 lastcell.player = player;
2142 1859
2143 mask |= 0x8; 1860 mask |= 0x8;
2144 *last_ext |= 0x80; 1861 *last_ext |= 0x80;
2145 last_ext = sl.buf + sl.len; 1862 last_ext = &sl[sl.length ()];
2146 SockList_AddChar (&sl, 0x47); 1863
2147 SockList_AddChar (&sl, 4); 1864 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2148 SockList_AddInt (&sl, player); 1865 }
1866
1867 if (lastcell.flags != flags)
1868 {
1869 lastcell.flags = flags;
1870
1871 mask |= 0x8;
1872 *last_ext |= 0x80;
1873 last_ext = &sl[sl.length ()];
1874
1875 sl << uint8 (8) << uint8 (flags);
2149 } 1876 }
2150 } 1877 }
2151 1878
2152 /* Floor face */ 1879 /* Floor face */
2153 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 1880 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2154 mask |= 0x4; 1881 mask |= 0x4;
2155 1882
2156 if (socket.EMI_smooth) 1883 if (socket.EMI_smooth)
2157 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 1884 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2158 emask |= 0x4; 1885 emask |= 0x4;
2159 1886
2160 /* Middle face */ 1887 /* Middle face */
2161 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 1888 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2162 mask |= 0x2; 1889 mask |= 0x2;
2163 1890
2164 if (socket.EMI_smooth) 1891 if (socket.EMI_smooth)
2165 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 1892 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2166 emask |= 0x2; 1893 emask |= 0x2;
2167 1894
2168 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1895 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2169 { 1896 {
2170 if (lastcell.faces[0] != pl->face->number) 1897 if (lastcell.faces[0] != pl->face->number)
2171 { 1898 {
2172 lastcell.faces[0] = pl->face->number; 1899 lastcell.faces[0] = pl->face->number;
2173 mask |= 0x1; 1900 mask |= 0x1;
1901
2174 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1902 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2175 esrv_send_face (&socket, pl->face->number, 0); 1903 esrv_send_face (&socket, pl->face->number, 0);
2176 SockList_AddShort (&sl, pl->face->number); 1904
1905 sl << uint16 (pl->face->number);
2177 } 1906 }
2178 } 1907 }
2179 /* Top face */
2180 else 1908 else
2181 { 1909 {
1910 /* Top face */
2182 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 1911 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2183 mask |= 0x1; 1912 mask |= 0x1;
1913
2184 if (socket.EMI_smooth) 1914 if (socket.EMI_smooth)
2185 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 1915 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2186 {
2187 emask |= 0x1; 1916 emask |= 0x1;
2188 }
2189 } 1917 }
1918
2190 /* Check to see if we are in fact sending anything for this 1919 /* Check to see if we are in fact sending anything for this
2191 * space by checking the mask. If so, update the mask. 1920 * space by checking the mask. If so, update the mask.
2192 * if not, reset the len to that from before adding the mask 1921 * if not, reset the len to that from before adding the mask
2193 * value, so we don't send those bits. 1922 * value, so we don't send those bits.
2194 */ 1923 */
2195 if (mask & 0xf) 1924 if (mask & 0xf)
2196 {
2197 sl.buf[oldlen + 1] = mask & 0xff; 1925 sl[oldlen + 1] = mask & 0xff;
2198 }
2199 else 1926 else
2200 {
2201 sl.len = oldlen; 1927 sl.reset (oldlen);
2202 } 1928
2203 if (emask & 0xf) 1929 if (emask & 0xf)
2204 {
2205 esl.buf[eoldlen + 1] = emask & 0xff; 1930 esl[eoldlen + 1] = emask & 0xff;
2206 }
2207 else 1931 else
2208 {
2209 esl.len = eoldlen; 1932 esl.reset (eoldlen);
2210 }
2211 } /* else this is a viewable space */ 1933 } /* else this is a viewable space */
2212 } /* for x loop */ 1934 } /* for x loop */
2213 } /* for y loop */ 1935 } /* for y loop */
2214 1936
2215 /* Verify that we in fact do need to send this */ 1937 /* Verify that we in fact do need to send this */
2216 if (socket.ext_mapinfos) 1938 if (socket.ext_mapinfos)
2217 { 1939 {
2218 if (!(sl.len > startlen || socket.sent_scroll)) 1940 if (!(sl.length () > startlen || socket.sent_scroll))
2219 { 1941 {
2220 /* No map data will follow, so don't say the client 1942 /* No map data will follow, so don't say the client
2221 * it doesn't need draw! 1943 * it doesn't need draw!
2222 */ 1944 */
2223 ewhatflag &= (~EMI_NOREDRAW); 1945 ewhatflag &= (~EMI_NOREDRAW);
2224 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1946 esl[ewhatstart + 1] = ewhatflag & 0xff;
2225 } 1947 }
1948
2226 if (esl.len > estartlen) 1949 if (esl.length () > estartlen)
2227 { 1950 socket.send_packet (esl);
2228 Send_With_Handling (&socket, &esl);
2229 }
2230 free (esl.buf);
2231 } 1951 }
1952
2232 if (sl.len > startlen || socket.sent_scroll) 1953 if (sl.length () > startlen || socket.sent_scroll)
2233 { 1954 {
2234 Send_With_Handling (&socket, &sl); 1955 socket.send_packet (sl);
2235 socket.sent_scroll = 0; 1956 socket.sent_scroll = 0;
2236 } 1957 }
2237 free (sl.buf);
2238} 1958}
2239 1959
2240/** 1960/**
2241 * Draws client map. 1961 * Draws client map.
2242 */ 1962 */
… …
2247 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1967 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2248 New_Face *face, *floor; 1968 New_Face *face, *floor;
2249 New_Face *floor2; 1969 New_Face *floor2;
2250 int d, mflags; 1970 int d, mflags;
2251 struct Map newmap; 1971 struct Map newmap;
2252 mapstruct *m, *pm; 1972 maptile *m, *pm;
2253 1973
2254 if (pl->type != PLAYER) 1974 if (pl->type != PLAYER)
2255 { 1975 {
2256 LOG (llevError, "draw_client_map called with non player/non eric-server\n"); 1976 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2257 return; 1977 return;
… …
2266 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1986 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2267 return; 1987 return;
2268 1988
2269 memset (&newmap, 0, sizeof (struct Map)); 1989 memset (&newmap, 0, sizeof (struct Map));
2270 1990
2271 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 1991 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2272 {
2273 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 1992 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2274 { 1993 {
2275 ax = i; 1994 ax = i;
2276 ay = j; 1995 ay = j;
2277 m = pm; 1996 m = pm;
2278 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1997 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1998
2279 if (mflags & P_OUT_OF_MAP) 1999 if (mflags & P_OUT_OF_MAP)
2280 continue; 2000 continue;
2281 if (mflags & P_NEED_UPDATE) 2001
2282 update_position (m, ax, ay);
2283 /* If a map is visible to the player, we don't want to swap it out 2002 /* If a map is visible to the player, we don't want to swap it out
2284 * just to reload it. This should really call something like 2003 * just to reload it. This should really call something like
2285 * swap_map, but this is much more efficient and 'good enough' 2004 * swap_map, but this is much more efficient and 'good enough'
2286 */ 2005 */
2287 if (mflags & P_NEW_MAP) 2006 if (mflags & P_NEW_MAP)
2288 m->timeout = 50; 2007 m->timeout = 50;
2289 } 2008 }
2290 } 2009
2291 /* do LOS after calls to update_position */ 2010 /* do LOS after calls to update_position */
2292 if (pl->contr->do_los) 2011 if (pl->contr->do_los)
2293 { 2012 {
2294 update_los (pl); 2013 update_los (pl);
2295 pl->contr->do_los = 0; 2014 pl->contr->do_los = 0;
2296 } 2015 }
2297 2016
2298 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2299 {
2300 /* Big maps need a different drawing mechanism to work */ 2017 /* Big maps need a different drawing mechanism to work */
2301 draw_client_map1 (pl); 2018 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} 2019}
2365 2020
2366 2021
2367/*****************************************************************************/ 2022/*****************************************************************************/
2368 2023
… …
2374 2029
2375/*****************************************************************************/ 2030/*****************************************************************************/
2376void 2031void
2377send_plugin_custom_message (object *pl, char *buf) 2032send_plugin_custom_message (object *pl, char *buf)
2378{ 2033{
2379 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2034 pl->contr->ns->send_packet (buf);
2380} 2035}
2381 2036
2382/** 2037/**
2383 * This sends the skill number to name mapping. We ignore 2038 * This sends the skill number to name mapping. We ignore
2384 * the params - we always send the same info no matter what. 2039 * the params - we always send the same info no matter what.
2385 */ 2040 */
2386void 2041void
2387send_skill_info (NewSocket * ns, char *params) 2042send_skill_info (client *ns, char *params)
2388{ 2043{
2389 SockList sl; 2044 packet sl;
2390 int i; 2045 sl << "replyinfo skill_info\n";
2391 2046
2392 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2393 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2394 for (i = 1; i < NUM_SKILLS; i++) 2047 for (int i = 1; i < NUM_SKILLS; i++)
2395 { 2048 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]); 2049
2397 }
2398 sl.len = strlen ((char *) sl.buf);
2399 if (sl.len >= MAXSOCKBUF) 2050 if (sl.length () >= MAXSOCKBUF)
2400 { 2051 {
2401 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2052 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2402 fatal (0); 2053 fatal (0);
2403 } 2054 }
2404 Send_With_Handling (ns, &sl); 2055
2405 free (sl.buf); 2056 ns->send_packet (sl);
2406} 2057}
2407 2058
2408/** 2059/**
2409 * This sends the spell path to name mapping. We ignore 2060 * This sends the spell path to name mapping. We ignore
2410 * the params - we always send the same info no matter what. 2061 * the params - we always send the same info no matter what.
2411 */ 2062 */
2412void 2063void
2413send_spell_paths (NewSocket * ns, char *params) 2064send_spell_paths (client * ns, char *params)
2414{ 2065{
2415 SockList sl; 2066 packet sl;
2416 int i;
2417 2067
2418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2068 sl << "replyinfo spell_paths\n";
2419 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2069
2420 for (i = 0; i < NRSPELLPATHS; i++) 2070 for (int i = 0; i < NRSPELLPATHS; i++)
2421 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2071 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2422 sl.len = strlen ((char *) sl.buf); 2072
2423 if (sl.len >= MAXSOCKBUF) 2073 if (sl.length () >= MAXSOCKBUF)
2424 { 2074 {
2425 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2075 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2426 fatal (0); 2076 fatal (0);
2427 } 2077 }
2428 Send_With_Handling (ns, &sl); 2078
2429 free (sl.buf); 2079 ns->send_packet (sl);
2430} 2080}
2431 2081
2432/** 2082/**
2433 * This looks for any spells the player may have that have changed their stats. 2083 * 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 2084 * it then sends an updspell packet for each spell that has changed in this way
2435 */ 2085 */
2436void 2086void
2437esrv_update_spells (player *pl) 2087esrv_update_spells (player *pl)
2438{ 2088{
2439 SockList sl; 2089 if (!pl->ns)
2440 int flags = 0;
2441 object *spell;
2442
2443 if (!pl->socket.monitor_spells)
2444 return; 2090 return;
2091
2092 if (!pl->ns->monitor_spells)
2093 return;
2094
2445 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2095 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2446 { 2096 {
2447 if (spell->type == SPELL) 2097 if (spell->type == SPELL)
2448 { 2098 {
2099 int flags = 0;
2100
2449 /* check if we need to update it */ 2101 /* check if we need to update it */
2450 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2102 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2451 { 2103 {
2452 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2104 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2453 flags |= UPD_SP_MANA; 2105 flags |= UPD_SP_MANA;
2454 } 2106 }
2107
2455 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2108 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2456 { 2109 {
2457 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2110 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2458 flags |= UPD_SP_GRACE; 2111 flags |= UPD_SP_GRACE;
2459 } 2112 }
2113
2460 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2114 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2461 { 2115 {
2462 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2116 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2463 flags |= UPD_SP_DAMAGE; 2117 flags |= UPD_SP_DAMAGE;
2464 } 2118 }
2119
2465 if (flags != 0) 2120 if (flags)
2466 { 2121 {
2467 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2122 packet sl;
2468 strcpy ((char *) sl.buf, "updspell "); 2123
2469 sl.len = strlen ((char *) sl.buf); 2124 sl << "updspell "
2470 SockList_AddChar (&sl, flags); 2125 << uint8 (flags)
2471 SockList_AddInt (&sl, spell->count); 2126 << uint32 (spell->count);
2472 if (flags & UPD_SP_MANA) 2127
2473 SockList_AddShort (&sl, spell->last_sp); 2128 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2474 if (flags & UPD_SP_GRACE) 2129 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2475 SockList_AddShort (&sl, spell->last_grace); 2130 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2476 if (flags & UPD_SP_DAMAGE) 2131
2477 SockList_AddShort (&sl, spell->last_eat); 2132 pl->ns->send_packet (sl);
2478 flags = 0;
2479 Send_With_Handling (&pl->socket, &sl);
2480 free (sl.buf);
2481 } 2133 }
2482 } 2134 }
2483 } 2135 }
2484} 2136}
2485 2137
2486void 2138void
2487esrv_remove_spell (player *pl, object *spell) 2139esrv_remove_spell (player *pl, object *spell)
2488{ 2140{
2489 SockList sl;
2490
2491 if (!pl->socket.monitor_spells) 2141 if (!pl->ns->monitor_spells)
2492 return; 2142 return;
2143
2493 if (!pl || !spell || spell->env != pl->ob) 2144 if (!pl || !spell || spell->env != pl->ob)
2494 { 2145 {
2495 LOG (llevError, "Invalid call to esrv_remove_spell"); 2146 LOG (llevError, "Invalid call to esrv_remove_spell");
2496 return; 2147 return;
2497 } 2148 }
2498 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2149
2499 strcpy ((char *) sl.buf, "delspell "); 2150 packet sl ("delspell");
2500 sl.len = strlen ((char *) sl.buf); 2151
2501 SockList_AddInt (&sl, spell->count); 2152 sl << uint32 (spell->count);
2502 Send_With_Handling (&pl->socket, &sl); 2153
2503 free (sl.buf); 2154 pl->ns->send_packet (sl);
2504} 2155}
2505 2156
2506/* appends the spell *spell to the Socklist we will send the data to. */ 2157/* appends the spell *spell to the Socklist we will send the data to. */
2507static void 2158static void
2508append_spell (player *pl, SockList * sl, object *spell) 2159append_spell (player *pl, packet &sl, object *spell)
2509{ 2160{
2510 int len, i, skill = 0; 2161 int len, i, skill = 0;
2511 2162
2512 if (!(spell->name)) 2163 if (!(spell->name))
2513 { 2164 {
2514 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2165 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2515 return; 2166 return;
2516 } 2167 }
2517 SockList_AddInt (sl, spell->count); 2168
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 */ 2169 /* 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); 2170 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); 2171 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); 2172 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 2173
2529 /* figure out which skill it uses, if it uses one */ 2174 /* figure out which skill it uses, if it uses one */
2530 if (spell->skill) 2175 if (spell->skill)
2531 { 2176 {
2532 for (i = 1; i < NUM_SKILLS; i++) 2177 for (i = 1; i < NUM_SKILLS; i++)
… …
2534 { 2179 {
2535 skill = i + CS_STAT_SKILLINFO; 2180 skill = i + CS_STAT_SKILLINFO;
2536 break; 2181 break;
2537 } 2182 }
2538 } 2183 }
2539 SockList_AddChar (sl, skill);
2540 2184
2541 SockList_AddInt (sl, spell->path_attuned); 2185 /* send the current values */
2186 sl << uint32 (spell->count)
2187 << uint16 (spell->level)
2188 << uint16 (spell->casting_time)
2189 << uint16 (spell->last_sp)
2190 << uint16 (spell->last_grace)
2191 << uint16 (spell->last_eat)
2192 << uint8 (skill)
2193 << uint32 (spell->path_attuned)
2542 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2194 << uint32 (spell->face ? spell->face->number : 0)
2543 2195 << data8 (spell->name)
2544 len = strlen (spell->name); 2196 << 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} 2197}
2561 2198
2562/** 2199/**
2563 * This tells the client to add the spell *ob, if *ob is NULL, then add 2200 * This tells the client to add the spell *ob, if *ob is NULL, then add
2564 * all spells in the player's inventory. 2201 * all spells in the player's inventory.
2565 */ 2202 */
2566void 2203void
2567esrv_add_spells (player *pl, object *spell) 2204esrv_add_spells (player *pl, object *spell)
2568{ 2205{
2569 SockList sl;
2570
2571 if (!pl) 2206 if (!pl)
2572 { 2207 {
2573 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2208 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2574 return; 2209 return;
2575 } 2210 }
2211
2576 if (!pl->socket.monitor_spells) 2212 if (!pl->ns->monitor_spells)
2577 return; 2213 return;
2578 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2214
2579 strcpy ((char *) sl.buf, "addspell "); 2215 packet sl ("addspell");
2580 sl.len = strlen ((char *) sl.buf); 2216
2581 if (!spell) 2217 if (!spell)
2582 { 2218 {
2583 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2219 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2584 { 2220 {
2585 /* were we to simply keep appending data here, we could exceed 2221 /* 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 2231 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2596 * like it will fix this 2232 * like it will fix this
2597 */ 2233 */
2598 if (spell->type != SPELL) 2234 if (spell->type != SPELL)
2599 continue; 2235 continue;
2236
2600 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2237 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2601 { 2238 {
2602 Send_With_Handling (&pl->socket, &sl); 2239 pl->ns->send_packet (sl);
2603 strcpy ((char *) sl.buf, "addspell "); 2240
2604 sl.len = strlen ((char *) sl.buf); 2241 sl.reset ();
2242 sl << "addspell ";
2605 } 2243 }
2244
2606 append_spell (pl, &sl, spell); 2245 append_spell (pl, sl, spell);
2607 } 2246 }
2608 } 2247 }
2609 else if (spell->type != SPELL) 2248 else if (spell->type != SPELL)
2610 { 2249 {
2611 LOG (llevError, "Asked to send a non-spell object as a spell"); 2250 LOG (llevError, "Asked to send a non-spell object as a spell");
2612 return; 2251 return;
2613 } 2252 }
2614 else 2253 else
2615 append_spell (pl, &sl, spell); 2254 append_spell (pl, sl, spell);
2255
2616 if (sl.len >= MAXSOCKBUF) 2256 if (sl.length () >= MAXSOCKBUF)
2617 { 2257 {
2618 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2258 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2619 fatal (0); 2259 fatal (0);
2620 } 2260 }
2261
2621 /* finally, we can send the packet */ 2262 /* finally, we can send the packet */
2622 Send_With_Handling (&pl->socket, &sl); 2263 pl->ns->send_packet (sl);
2623 free (sl.buf);
2624} 2264}
2265

Diff Legend

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