ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.23 by root, Tue Sep 19 10:35:22 2006 UTC vs.
Revision 1.48 by root, Wed Dec 20 11:36:39 2006 UTC

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

Diff Legend

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