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.18 by root, Thu Sep 14 19:08:41 2006 UTC vs.
Revision 1.45 by root, Tue Dec 19 04:58:05 2006 UTC

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

Diff Legend

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