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

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

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.27 by root, Wed Dec 13 18:08:02 2006 UTC vs. Revision 1.45 by root, Tue Dec 19 04:58:05 2006 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.27 by root, Wed Dec 13 18:08:02 2006 UTC vs.
Revision 1.45 by root, Tue Dec 19 04:58:05 2006 UTC