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

Diff Legend

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