[ViewVC] Diff of: cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.25 by root, Thu Sep 21 14:51:16 2006 UTC vs.
Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.25 by root, Thu Sep 21 14:51:16 2006 UTC vs. Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.25 by root, Thu Sep 21 14:51:16 2006 UTC vs.
Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC