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.20 by root, Thu Sep 14 23:13:49 2006 UTC vs.
Revision 1.40 by root, Fri Dec 15 04:21:29 2006 UTC

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

Diff Legend

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