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

Diff Legend

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