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.21 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.56 by root, Mon Jan 1 12:28:47 2007 UTC

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

Diff Legend

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