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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.38 by root, Thu Dec 14 22:45:41 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	*/	43	*/
47		44
48	#include <global.h>	45	#include <global.h>
49	#include <sproto.h>	46	#include <sproto.h>
50		47
51	#include <newclient.h>
52	#include <newserver.h>
53	#include <living.h>	48	#include <living.h>
54	#include <commands.h>	49	#include <commands.h>
55		50
56	/* 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,
57	* it should work here.	52	* it should work here.
…		…
88	-1, /* life stealing */	83	-1, /* life stealing */
89	-1 /* Disease - not fully done yet */	84	-1 /* Disease - not fully done yet */
90	};	85	};
91		86
92	static void	87	static void
93	socket_map_scroll (client_socket * ns, int dx, int dy)	88	socket_map_scroll (client *ns, int dx, int dy)
94	{	89	{
95	struct Map newmap;	90	struct Map newmap;
96	int x, y, mx, my;	91	int x, y, mx, my;
97		92
98	{
99	packet sl;
100
101	sl.printf ("map_scroll %d %d", dx, dy);	93	ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102	ns->send_packet (sl);
103	}
104		94
105	/* If we are using the Map1aCmd, we may in fact send	95	/* If we are using the Map1aCmd, we may in fact send
106	* head information that is outside the viewable map.	96	* head information that is outside the viewable map.
107	* 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
108	* look for. Removed code to do so - it caused extra	98	* look for. Removed code to do so - it caused extra
…		…
148	}	138	}
149		139
150	static void	140	static void
151	clear_map (player *pl)	141	clear_map (player *pl)
152	{	142	{
153	client_socket &socket = *pl->socket;	143	client &socket = *pl->socket;
154		144
155	memset (&socket.lastmap, 0, sizeof (socket.lastmap));	145	memset (&socket.lastmap, 0, sizeof (socket.lastmap));
156		146
157	if (socket.newmapcmd == 1)	147	if (socket.newmapcmd == 1)
158	socket.send_packet ("newmap");	148	socket.send_packet ("newmap");
…		…
163		153
164	/** check for map change and send new map data */	154	/** check for map change and send new map data */
165	static void	155	static void
166	check_map_change (player *pl)	156	check_map_change (player *pl)
167	{	157	{
168	client_socket &socket = *pl->socket;	158	client &socket = *pl->socket;
169	object *ob = pl->ob;	159	object *ob = pl->ob;
170	char buf[MAX_BUF]; /* eauugggh */	160	char buf[MAX_BUF]; /* eauugggh */
171		161
172	if (socket.current_map != ob->map)	162	if (socket.current_map != ob->map)
173	{	163	{
…		…
216		206
217	socket.current_x = ob->x;	207	socket.current_x = ob->x;
218	socket.current_y = ob->y;	208	socket.current_y = ob->y;
219	}	209	}
220		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
221	void	255	void
222	ExtCmd (char buf, int len, player pl)	256	ExtCmd (char buf, int len, player pl)
223	{	257	{
224	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));
225	}	265	}
226		266
227	void	267	void
228	MapInfoCmd (char buf, int len, player pl)	268	MapInfoCmd (char buf, int len, player pl)
229	{	269	{
…		…
311	pl->socket->send_packet (bigbuf);	351	pl->socket->send_packet (bigbuf);
312	}	352	}
313		353
314	/** This is the Setup cmd - easy first implementation */	354	/** This is the Setup cmd - easy first implementation */
315	void	355	void
316	SetUp (char buf, int len, client_socket ns)	356	SetUp (char buf, int len, client ns)
317	{	357	{
318	int s, slen;	358	int s, slen;
319	char cmd, param, cmdback[HUGE_BUF];	359	char cmd, param, cmdback[HUGE_BUF];
320		360
321	/* run through the cmds of setup	361	/* run through the cmds of setup
…		…
531	* 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.
532	* 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,
533	* 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.
534	*/	574	*/
535	void	575	void
536	AddMeCmd (char buf, int len, client_socket ns)	576	AddMeCmd (char buf, int len, client ns)
537	{	577	{
538	Settings oldsettings;
539
540	oldsettings = settings;
541	if (ns->status != Ns_Add \|\| add_player (ns))	578	if (ns->status != Ns_Add \|\| add_player (ns))
542	ns->send_packet ("addme_failed");	579	ns->send_packet ("addme_failed");
543	else	580	else
544	ns->send_packet ("addme_success");	581	ns->send_packet ("addme_success");
545
546	settings = oldsettings;
547	}	582	}
548		583
549	/** Reply to ExtendedInfos command */	584	/** Reply to ExtendedInfos command */
550	void	585	void
551	ToggleExtendedInfos (char buf, int len, client_socket ns)	586	ToggleExtendedInfos (char buf, int len, client ns)
552	{	587	{
553	char cmdback[MAX_BUF];	588	char cmdback[MAX_BUF];
554	char command[50];	589	char command[50];
555	int info, nextinfo;	590	int info, nextinfo;
556		591
…		…
607	#define MSG_TYPE_MONUMENT 5	642	#define MSG_TYPE_MONUMENT 5
608	#define MSG_TYPE_SCRIPTED_DIALOG 6*/	643	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
609		644
610	/** Reply to ExtendedInfos command */	645	/** Reply to ExtendedInfos command */
611	void	646	void
612	ToggleExtendedText (char buf, int len, client_socket ns)	647	ToggleExtendedText (char buf, int len, client ns)
613	{	648	{
614	char cmdback[MAX_BUF];	649	char cmdback[MAX_BUF];
615	char temp[10];	650	char temp[10];
616	char command[50];	651	char command[50];
617	int info, nextinfo, i, flag;	652	int info, nextinfo, i, flag;
…		…
668	* 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
669	* 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
670	* client.	705	* client.
671	*/	706	*/
672	static void	707	static void
673	SendSmooth (client_socket * ns, uint16 face)	708	SendSmooth (client *ns, uint16 face)
674	{	709	{
675	uint16 smoothface;	710	uint16 smoothface;
676		711
677	/* 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
678	* again.	713	* again.
…		…
702	/**	737	/**
703	* Tells client the picture it has to use	738	* Tells client the picture it has to use
704	* to smooth a picture number given as argument.	739	* to smooth a picture number given as argument.
705	*/	740	*/
706	void	741	void
707	AskSmooth (char buf, int len, client_socket ns)	742	AskSmooth (char buf, int len, client ns)
708	{	743	{
709	uint16 facenbr;	744	SendSmooth (ns, atoi (buf));
710
711	facenbr = atoi (buf);
712	SendSmooth (ns, facenbr);
713	}	745	}
714		746
715	/**	747	/**
716	* 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,
717	* etc.)	749	* etc.)
718	*/	750	*/
719	void	751	void
720	PlayerCmd (char buf, int len, player pl)	752	PlayerCmd (char buf, int len, player pl)
721	{	753	{
722
723	/* The following should never happen with a proper or honest client.
724	* Therefore, the error message doesn't have to be too clear - if
725	* someone is playing with a hacked/non working client, this gives them
726	* an idea of the problem, but they deserve what they get
727	*/
728	if (pl->state != ST_PLAYING)
729	{
730	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
731	return;
732	}
733	/* 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
734	* sent, so check for that also.	755	* sent, so check for that also.
735	*/	756	*/
736	if (atoi (buf) \|\| buf[0] == '0')	757	if (atoi (buf) \|\| buf[0] == '0')
737	{	758	{
738	pl->count = atoi ((char *) buf);	759	pl->count = atoi ((char *) buf);
		760
739	buf = strchr (buf, ' '); /* advance beyond the numbers */	761	buf = strchr (buf, ' '); /* advance beyond the numbers */
740	if (!buf)	762	if (!buf)
741	{
742	#ifdef ESRV_DEBUG
743	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
744	#endif
745	return;	763	return;
746	}	764
747	buf++;	765	buf++;
748	}	766	}
749	/* This should not happen anymore. */	767
750	if (pl->ob->speed_left < -1.0)
751	{
752	LOG (llevError, "Player has negative time - shouldn't do command.\n");
753	}
754	/* In c_new.c */
755	execute_newserver_command (pl->ob, (char *) buf);	768	execute_newserver_command (pl->ob, (char *) buf);
		769
756	/* Perhaps something better should be done with a left over count.	770	/* Perhaps something better should be done with a left over count.
757	* Cleaning up the input should probably be done first - all actions	771	* Cleaning up the input should probably be done first - all actions
758	* 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
759	* commands.	773	* commands.
760	*/	774	*/
761
762	pl->count = 0;	775	pl->count = 0;
763
764	}	776	}
765		777
766		778
767	/**	779	/**
768	* 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,
769	* 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
770	* '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
771	* can throttle.	783	* can throttle.
772	*/	784	*/
773	void	785	void
774	NewPlayerCmd (uint8 * buf, int len, player *pl)	786	NewPlayerCmd (char buf, int len, player pl)
775	{	787	{
776	int time, repeat;
777	char command[MAX_BUF];
778	int pktlen;
779
780	if (len < 7)	788	if (len <= 6)
781	{	789	{
782	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);
783	return;	791	return;
784	}	792	}
785		793
786	pktlen = net_uint16 (buf);	794	uint16 cmdid = net_uint16 ((uint8 *)buf);
787	repeat = net_uint32 (buf + 2);	795	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
788		796
789	/* -1 is special - no repeat, but don't update */	797	/* -1 is special - no repeat, but don't update */
790	if (repeat != -1)	798	if (repeat != -1)
791	pl->count = repeat;	799	pl->count = repeat;
792		800
793	if ((len - 4) >= MAX_BUF)	801	buf += 6; //len -= 6;
794	len = MAX_BUF - 5;
795		802
796	strncpy ((char ) command, (char ) buf + 6, len - 4);
797	command[len - 4] = '\0';
798
799	/* The following should never happen with a proper or honest client.
800	* Therefore, the error message doesn't have to be too clear - if
801	* someone is playing with a hacked/non working client, this gives them
802	* an idea of the problem, but they deserve what they get
803	*/
804	if (pl->state != ST_PLAYING)
805	{
806	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
807	return;
808	}
809
810	/* This should not happen anymore. */
811	if (pl->ob->speed_left < -1.0)
812	LOG (llevError, "Player has negative time - shouldn't do command.\n");
813
814	/* In c_new.c */
815	execute_newserver_command (pl->ob, (char *) command);	803	execute_newserver_command (pl->ob, buf);
		804
816	/* Perhaps something better should be done with a left over count.	805	/* Perhaps something better should be done with a left over count.
817	* Cleaning up the input should probably be done first - all actions	806	* Cleaning up the input should probably be done first - all actions
818	* 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
819	* commands.	808	* commands.
820	*/	809	*/
821	pl->count = 0;	810	pl->count = 0;
822		811
		812	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
823	if (FABS (pl->ob->speed) < 0.001)	813	int time = FABS (pl->ob->speed) < 0.001
824	time = MAX_TIME * 100;	814	? time = MAX_TIME * 100
825	else
826	time = (int) (MAX_TIME / FABS (pl->ob->speed));	815	: time = (int) (MAX_TIME / FABS (pl->ob->speed));
827		816
828	/* Send confirmation of command execution now */	817	/* Send confirmation of command execution now */
829
830	packet sl;	818	packet sl;
831	sl << "comc " << uint16 (pktlen) << uint32 (time);	819	sl << "comc " << uint16 (cmdid) << uint32 (time);
832	pl->socket->send_packet (sl);	820	pl->socket->send_packet (sl);
833	}	821	}
834		822
835		823
836	/** This is a reply to a previous query. */	824	/** This is a reply to a previous query. */
837	void	825	void
838	ReplyCmd (char buf, int len, player pl)	826	ReplyCmd (char buf, int len, player pl)
839	{	827	{
840	/* 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
841	* 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
842	* once all the X11 code is removed from the server.	830	* once all the X11 code is removed from the server.
843	*	831	*
844	* 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
845	* think it was the carriage return that was entered, and the	833	* think it was the carriage return that was entered, and the
846	* function then does not try to do additional input.	834	* function then does not try to do additional input.
…		…
849		837
850	/* this avoids any hacking here */	838	/* this avoids any hacking here */
851		839
852	switch (pl->state)	840	switch (pl->state)
853	{	841	{
854	case ST_PLAYING:	842	case ST_PLAYING:
855	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	843	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
856	break;	844	break;
857		845
858	case ST_PLAY_AGAIN:	846	case ST_PLAY_AGAIN:
859	/* We can check this for return value (2==quit). Maybe we	847	/* We can check this for return value (2==quit). Maybe we
860	* should, and do something appropriate?	848	* should, and do something appropriate?
861	*/	849	*/
862	receive_play_again (pl->ob, buf[0]);	850	receive_play_again (pl->ob, buf[0]);
863	break;	851	break;
864		852
865	case ST_ROLL_STAT:	853	case ST_ROLL_STAT:
866	key_roll_stat (pl->ob, buf[0]);	854	key_roll_stat (pl->ob, buf[0]);
867	break;	855	break;
868		856
869	case ST_CHANGE_CLASS:	857	case ST_CHANGE_CLASS:
870		858
871	key_change_class (pl->ob, buf[0]);	859	key_change_class (pl->ob, buf[0]);
872	break;	860	break;
873		861
874	case ST_CONFIRM_QUIT:	862	case ST_CONFIRM_QUIT:
875	key_confirm_quit (pl->ob, buf[0]);	863	key_confirm_quit (pl->ob, buf[0]);
876	break;	864	break;
877		865
878	case ST_CONFIGURE:	866	case ST_CONFIGURE:
879	LOG (llevError, "In client input handling, but into configure state\n");	867	LOG (llevError, "In client input handling, but into configure state\n");
880	pl->state = ST_PLAYING;	868	pl->state = ST_PLAYING;
881	break;	869	break;
882		870
883	case ST_GET_NAME:	871	case ST_GET_NAME:
884	receive_player_name (pl->ob, 13);	872	receive_player_name (pl->ob, 13);
885	break;	873	break;
886		874
887	case ST_GET_PASSWORD:	875	case ST_GET_PASSWORD:
888	case ST_CONFIRM_PASSWORD:	876	case ST_CONFIRM_PASSWORD:
889	receive_player_password (pl->ob, 13);	877	receive_player_password (pl->ob, 13);
890	break;	878	break;
891		879
892	case ST_GET_PARTY_PASSWORD: /* Get password for party */	880	case ST_GET_PARTY_PASSWORD: /* Get password for party */
893	receive_party_password (pl->ob, 13);	881	receive_party_password (pl->ob, 13);
894	break;	882	break;
895		883
896	default:	884	default:
897	LOG (llevError, "Unknown input state: %d\n", pl->state);	885	LOG (llevError, "Unknown input state: %d\n", pl->state);
898	}	886	}
899	}	887	}
900		888
901	/**	889	/**
902	* 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
…		…
904	* 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
905	* 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
906	* problem.	894	* problem.
907	*/	895	*/
908	void	896	void
909	VersionCmd (char buf, int len, client_socket ns)	897	VersionCmd (char buf, int len, client ns)
910	{	898	{
911	char *cp;
912	char version_warning[256];
913
914	if (!buf)	899	if (!buf)
915	{	900	{
916	LOG (llevError, "CS: received corrupted version command\n");	901	LOG (llevError, "CS: received corrupted version command\n");
917	return;	902	return;
918	}	903	}
919		904
920	ns->cs_version = atoi (buf);	905	ns->cs_version = atoi (buf);
921	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
922	if (VERSION_CS != ns->cs_version)	913	//if (VERSION_CS != ns->cs_version)
923	{	914	// unchecked;
924	#ifdef ESRV_DEBUG	915
925	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
926	#endif
927	}
928	cp = strchr (buf + 1, ' ');	916	char *cp = strchr (buf + 1, ' ');
929	if (!cp)	917	if (!cp)
930	return;	918	return;
		919
931	ns->sc_version = atoi (cp);	920	ns->sc_version = atoi (cp);
		921
932	if (VERSION_SC != ns->sc_version)	922	//if (VERSION_SC != ns->sc_version)
933	{	923	// unchecked;
934	#ifdef ESRV_DEBUG	924
935	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
936	#endif
937	}
938	cp = strchr (cp + 1, ' ');	925	cp = strchr (cp + 1, ' ');
		926
939	if (cp)	927	if (cp)
940	{	928	{
941	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);	929	assign (ns->version, cp + 1);
942		930
943	snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
944
945	/* This is first implementation - i skip all beta DX clients with it
946	* Add later stuff here for other clients
947	*/
948
949	/* these are old dxclients */
950	/* Version 1024 added support for singular + plural name values -
951	* requiing this minimal value reduces complexity of that code, and it
952	* has been around for a long time.
953	*/
954	if (ns->sc_version < 1026)	931	if (ns->sc_version < 1026)
955	{	932	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
956	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
957	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");	933	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
958	ns->send_packet (version_warning);
959	}
960
961	}	934	}
962	}	935	}
963		936
964	/** sound related functions. */	937	/** sound related functions. */
965
966	void	938	void
967	SetSound (char buf, int len, client_socket ns)	939	SetSound (char buf, int len, client ns)
968	{	940	{
969	ns->sound = atoi (buf);	941	ns->sound = atoi (buf);
970	}	942	}
971		943
972	/** client wants the map resent */	944	/** client wants the map resent */
973		945
974	void	946	void
975	MapRedrawCmd (char buf, int len, player pl)	947	MapRedrawCmd (char buf, int len, player pl)
976	{	948	{
977
978	/* 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
979	* 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.
980	* Unfortunately this solution does not work because some client versions send	951	* Unfortunately this solution does not work because some client versions send
981	* a mapredraw command after receiving a newmap command.	952	* a mapredraw command after receiving a newmap command.
982	*/	953	*/
983	#if 0
984	/* Okay, this is MAJOR UGLY. but the only way I know how to
985	* clear the "cache"
986	*/
987	memset (&pl->socket->lastmap, 0, sizeof (struct Map));
988	draw_client_map (pl->ob);
989	#endif
990	}	954	}
991		955
992	/**	956	/**
993	* Moves an object (typically, container to inventory).	957	* Moves an object (typically, container to inventory).
994	* syntax is: move (to) (tag) (nrof)	958	* syntax is: move (to) (tag) (nrof)
…		…
997	MoveCmd (char buf, int len, player pl)	961	MoveCmd (char buf, int len, player pl)
998	{	962	{
999	int vals[3], i;	963	int vals[3], i;
1000		964
1001	/* A little funky here. We only cycle for 2 records, because	965	/* A little funky here. We only cycle for 2 records, because
1002	* 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
1003	* record. Perhaps we should just replace this with a	967	* record. Perhaps we should just replace this with a
1004	* sscanf?	968	* sscanf?
1005	*/	969	*/
1006	for (i = 0; i < 2; i++)	970	for (i = 0; i < 2; i++)
1007	{	971	{
1008	vals[i] = atoi (buf);	972	vals[i] = atoi (buf);
		973
1009	if (!(buf = strchr (buf, ' ')))	974	if (!(buf = strchr (buf, ' ')))
1010	{	975	{
1011	LOG (llevError, "Incomplete move command: %s\n", buf);	976	LOG (llevError, "Incomplete move command: %s\n", buf);
1012	return;	977	return;
1013	}	978	}
		979
1014	buf++;	980	buf++;
1015	}	981	}
		982
1016	vals[2] = atoi (buf);	983	vals[2] = atoi (buf);
1017		984
1018	/* 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]);*/
1019	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	986	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1020	}	987	}
1021
1022
1023		988
1024	/******************************************************************************	989	/******************************************************************************
1025	*	990	*
1026	* Start of commands the server sends to the client.	991	* Start of commands the server sends to the client.
1027	*	992	*
…		…
1030	/**	995	/**
1031	* 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
1032	* 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)
1033	*/	998	*/
1034	void	999	void
1035	send_query (client_socket * ns, uint8 flags, char *text)	1000	send_query (client ns, uint8 flags, char text)
1036	{	1001	{
1037	char buf[MAX_BUF];
1038
1039	sprintf (buf, "query %d %s", flags, text ? text : "");	1002	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1040	ns->send_packet (buf);
1041	}	1003	}
1042		1004
1043	#define AddIfInt64(Old,New,Type) if (Old != New) {\	1005	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1044	Old = New; \	1006	Old = New; \
1045	sl << uint8 (Type) << uint64 (New); \	1007	sl << uint8 (Type) << uint64 (New); \
…		…
1078	uint16 flags;	1040	uint16 flags;
1079		1041
1080	packet sl;	1042	packet sl;
1081	sl << "stats ";	1043	sl << "stats ";
1082		1044
1083	if (pl->ob != NULL)	1045	if (pl->ob)
1084	{	1046	{
1085	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);
1086	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);
1087	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);
1088	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);
…		…
1096	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);
1097	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);
1098	}	1060	}
1099		1061
1100	if (pl->socket->exp64)	1062	if (pl->socket->exp64)
1101	{
1102	uint8 s;
1103
1104	for (s = 0; s < NUM_SKILLS; s++)	1063	for (int s = 0; s < NUM_SKILLS; s++)
1105	{
1106	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)
1107	{	1065	{
1108	/* Always send along the level if exp changes. This is only	1066	/* Always send along the level if exp changes. This is only
1109	* 1 extra byte, but keeps processing simpler.	1067	* 1 extra byte, but keeps processing simpler.
1110	*/	1068	*/
1111	sl << uint8 (s + CS_STAT_SKILLINFO)	1069	sl << uint8 (s + CS_STAT_SKILLINFO)
1112	<< uint8 (pl->last_skill_ob[s]->level)	1070	<< uint8 (pl->last_skill_ob[s]->level)
1113	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1071	<< uint64 (pl->last_skill_ob[s]->stats.exp);
1114		1072
1115	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;
1116	}	1074	}
1117	}
1118	}
1119		1075
1120	if (pl->socket->exp64)	1076	if (pl->socket->exp64)
1121	{ 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) }
1122	else	1078	else
1123	{ 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) }
…		…
1141	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1097	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1142		1098
1143	if (pl->socket->sc_version < 1025)	1099	if (pl->socket->sc_version < 1025)
1144	{ 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) }
1145	else	1101	else
1146	{
1147	int i;
1148
1149	for (i = 0; i < NROFATTACKS; i++)	1102	for (int i = 0; i < NROFATTACKS; i++)
1150	{	1103	{
1151	/* Skip ones we won't send */	1104	/* Skip ones we won't send */
1152	if (atnr_cs_stat[i] == -1)	1105	if (atnr_cs_stat[i] == -1)
1153	continue;	1106	continue;
1154		1107
1155	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]);
1156	}	1109	}
1157	}
1158		1110
1159	if (pl->socket->monitor_spells)	1111	if (pl->socket->monitor_spells)
1160	{	1112	{
1161	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);
1162	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);
…		…
1199	* 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
1200	* 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
1201	* when the player logs in and picks stuff up.	1153	* when the player logs in and picks stuff up.
1202	*/	1154	*/
1203	void	1155	void
1204	esrv_send_animation (client_socket * ns, short anim_num)	1156	esrv_send_animation (client * ns, short anim_num)
1205	{	1157	{
1206	int i;
1207
1208	/* 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
1209	* 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
1210	* range, it must be a valid animation.	1160	* range, it must be a valid animation.
1211	*/	1161	*/
1212	if (anim_num < 0 \|\| anim_num > num_animations)	1162	if (anim_num < 0 \|\| anim_num > num_animations)
…		…
1222	<< uint16 (0); /* flags - not used right now */	1172	<< uint16 (0); /* flags - not used right now */
1223		1173
1224	/* 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
1225	* the face itself) down to the client.	1175	* the face itself) down to the client.
1226	*/	1176	*/
1227	for (i = 0; i < animations[anim_num].num_animations; i++)	1177	for (int i = 0; i < animations[anim_num].num_animations; i++)
1228	{	1178	{
1229	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))
1230	esrv_send_face (ns, animations[anim_num].faces[i], 0);	1180	esrv_send_face (ns, animations[anim_num].faces[i], 0);
		1181
1231	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */	1182	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1232	}	1183	}
1233		1184
1234	ns->send_packet (sl);	1185	ns->send_packet (sl);
1235		1186
…		…
1246	/**	1197	/**
1247	* 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
1248	* the face yet, we will also send it.	1199	* the face yet, we will also send it.
1249	*/	1200	*/
1250	static void	1201	static void
1251	esrv_map_setbelow (client_socket * 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)
1252	{	1203	{
1253	if (newmap->cells[x][y].count >= MAP_LAYERS)	1204	if (newmap->cells[x][y].count >= MAP_LAYERS)
1254	{	1205	{
		1206	//TODO: one or the other, can't both have abort and return, verify and act
1255	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);
1256	return;	1208	return;
1257	abort ();	1209	abort ();
1258	}	1210	}
1259		1211
1260	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;
1261	newmap->cells[x][y].count++;	1213	newmap->cells[x][y].count++;
1262		1214
1263	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))	1215	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1264	esrv_send_face (ns, face_num, 0);	1216	esrv_send_face (ns, face_num, 0);
1265	}
1266
1267	struct LayerCell
1268	{
1269	uint16 xy;
1270	short face;
1271	};
1272
1273	struct MapLayer
1274	{
1275	int count;
1276	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1277	};
1278
1279	/** Checkes if map cells have changed */
1280	static int
1281	mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1282	{
1283	int k;
1284
1285	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1286	return 1;
1287	for (k = 0; k < newmap->cells[i][j].count; k++)
1288	{
1289	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1290	{
1291	return 1;
1292	}
1293	}
1294	return 0;
1295	}
1296
1297	/**
1298	* Basically, what this does is pack the data into layers.
1299	* cnum is the client number, cur is the the buffer we put all of
1300	* this data into. we return the end of the data. layers is
1301	* how many layers of data we should back.
1302	*/
1303	static uint8 *
1304	compactlayer (client_socket * ns, unsigned char cur, int numlayers, struct Map newmap)
1305	{
1306	int x, y, k;
1307	int face;
1308	unsigned char *fcur;
1309	struct MapLayer layers[MAP_LAYERS];
1310
1311	for (k = 0; k < MAP_LAYERS; k++)
1312	layers[k].count = 0;
1313	fcur = cur;
1314	for (x = 0; x < ns->mapx; x++)
1315	{
1316	for (y = 0; y < ns->mapy; y++)
1317	{
1318	if (!mapcellchanged (ns, x, y, newmap))
1319	continue;
1320	if (newmap->cells[x][y].count == 0)
1321	{
1322	cur = x ns->mapy + y; /* mark empty space */
1323	cur++;
1324	continue;
1325	}
1326	for (k = 0; k < newmap->cells[x][y].count; k++)
1327	{
1328	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1329	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1330	layers[k].count++;
1331	}
1332	}
1333	}
1334	/* If no data, return now. */
1335	if (fcur == cur && layers[0].count == 0)
1336	return cur;
1337	cur = 255; / mark end of explicitly cleared cells */
1338	cur++;
1339	/* First pack by layers. */
1340	for (k = 0; k < numlayers; k++)
1341	{
1342	if (layers[k].count == 0)
1343	break; /* once a layer is entirely empty, no layer below it can
1344	have anything in it either */
1345	/* Pack by entries in thie layer */
1346	for (x = 0; x < layers[k].count;)
1347	{
1348	fcur = cur;
1349	*cur = layers[k].lcells[x].face >> 8;
1350	cur++;
1351	*cur = layers[k].lcells[x].face & 0xFF;
1352	cur++;
1353	face = layers[k].lcells[x].face;
1354	/* Now, we back the redundant data into 1 byte xy pairings */
1355	for (y = x; y < layers[k].count; y++)
1356	{
1357	if (layers[k].lcells[y].face == face)
1358	{
1359	*cur = (uint8) layers[k].lcells[y].xy;
1360	cur++;
1361	layers[k].lcells[y].face = -1;
1362	}
1363	}
1364	(cur - 1) = (cur - 1) \| 128; /* mark for end of xy's; 1111 < 128 /
1365	/* forward over the now redundant data */
1366	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1367	x++;
1368	}
1369	fcur = fcur \| 128; /* mark for end of faces at this layer */
1370	}
1371	return cur;
1372	}	1217	}
1373		1218
1374	/** Clears a map cell */	1219	/** Clears a map cell */
1375	static void	1220	static void
1376	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)
…		…
1388	#define MAX_LAYERS 3	1233	#define MAX_LAYERS 3
1389		1234
1390	/* 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
1391	* 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,
1392	* 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
1393	* 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
1394	* re-examined.	1239	* re-examined.
1395	*/	1240	*/
1396
1397	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];	1241	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];
1398		1242
1399	/**	1243	/**
1400	* Returns true if any of the heads for this	1244	* Returns true if any of the heads for this
1401	* 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
1402	* for empty space checking.	1246	* for empty space checking.
1403	*/	1247	*/
1404	static inline int	1248	static inline int
1405	have_head (int ax, int ay)	1249	have_head (int ax, int ay)
1406	{	1250	{
1407
1408	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|	1251	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|
1409	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])
1410	return 1;	1253	return 1;
		1254
1411	return 0;	1255	return 0;
1412	}	1256	}
1413		1257
1414	/**	1258	/**
1415	* check_head is a bit simplistic version of update_space below.	1259	* check_head is a bit simplistic version of update_space below.
1416	* 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
1417	* 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
1418	* 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
1419	* sent, it returns zero.	1263	* sent, it returns zero.
1420	*/	1264	*/
1421	static int	1265	static int
1422	check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)	1266	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1423	{	1267	{
1424	short face_num;	1268	short face_num;
1425		1269
1426	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])	1270	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1427	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;
…		…
1459	* numbers the spaces differently - I think this was a leftover from	1303	* numbers the spaces differently - I think this was a leftover from
1460	* 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
1461	* 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
1462	* actually match.	1306	* actually match.
1463	*/	1307	*/
1464
1465	static int	1308	static int
1466	update_space (packet &sl, client_socket &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)
1467	{	1310	{
1468	object ob, head;	1311	object ob, head;
1469	uint16 face_num;	1312	uint16 face_num;
1470	int bx, by, i;	1313	int bx, by, i;
1471		1314
…		…
1684	* 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
1685	* take.	1528	* take.
1686	*/	1529	*/
1687		1530
1688	static inline int	1531	static inline int
1689	update_smooth (packet &sl, client_socket &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)
1690	{	1533	{
1691	object *ob;	1534	object *ob;
1692	int smoothlevel; /* old face_num; */	1535	int smoothlevel; /* old face_num; */
1693		1536
1694	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1537	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
…		…
1728	* 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
1729	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries	1572	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
1730	* available.	1573	* available.
1731	*/	1574	*/
1732	int	1575	int
1733	getExtendedMapInfoSize (client_socket * ns)	1576	getExtendedMapInfoSize (client * ns)
1734	{	1577	{
1735	int result = 0;	1578	int result = 0;
1736		1579
1737	if (ns->ext_mapinfos)	1580	if (ns->ext_mapinfos)
1738	{	1581	{
1739	if (ns->EMI_smooth)	1582	if (ns->EMI_smooth)
1740	result += 1; /One byte for smoothlevel /	1583	result += 1; /One byte for smoothlevel /
1741	}	1584	}
		1585
1742	return result;	1586	return result;
1743	}	1587	}
1744		1588
1745	/**	1589	/**
1746	* 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
…		…
1774	uint8 eentrysize;	1618	uint8 eentrysize;
1775	uint16 ewhatstart, ewhatflag;	1619	uint16 ewhatstart, ewhatflag;
1776	uint8 extendedinfos;	1620	uint8 extendedinfos;
1777	maptile *m;	1621	maptile *m;
1778		1622
1779	client_socket &socket = *pl->contr->socket;	1623	client &socket = *pl->contr->socket;
1780		1624
1781	check_map_change (pl->contr);	1625	check_map_change (pl->contr);
1782		1626
1783	packet sl;	1627	packet sl;
1784	packet esl;	1628	packet esl;
…		…
2183	{	2027	{
2184	ax = i;	2028	ax = i;
2185	ay = j;	2029	ay = j;
2186	m = pm;	2030	m = pm;
2187	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	2031	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		2032
2188	if (mflags & P_OUT_OF_MAP)	2033	if (mflags & P_OUT_OF_MAP)
2189	continue;	2034	continue;
		2035
2190	if (mflags & P_NEED_UPDATE)	2036	if (mflags & P_NEED_UPDATE)
2191	update_position (m, ax, ay);	2037	update_position (m, ax, ay);
		2038
2192	/* 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
2193	* just to reload it. This should really call something like	2040	* just to reload it. This should really call something like
2194	* swap_map, but this is much more efficient and 'good enough'	2041	* swap_map, but this is much more efficient and 'good enough'
2195	*/	2042	*/
2196	if (mflags & P_NEW_MAP)	2043	if (mflags & P_NEW_MAP)
…		…
2227	/**	2074	/**
2228	* This sends the skill number to name mapping. We ignore	2075	* This sends the skill number to name mapping. We ignore
2229	* the params - we always send the same info no matter what.	2076	* the params - we always send the same info no matter what.
2230	*/	2077	*/
2231	void	2078	void
2232	send_skill_info (client_socket ns, char params)	2079	send_skill_info (client ns, char params)
2233	{	2080	{
2234	packet sl;	2081	packet sl;
2235	sl << "replyinfo skill_info\n";	2082	sl << "replyinfo skill_info\n";
2236		2083
2237	for (int i = 1; i < NUM_SKILLS; i++)	2084	for (int i = 1; i < NUM_SKILLS; i++)
…		…
2249	/**	2096	/**
2250	* This sends the spell path to name mapping. We ignore	2097	* This sends the spell path to name mapping. We ignore
2251	* the params - we always send the same info no matter what.	2098	* the params - we always send the same info no matter what.
2252	*/	2099	*/
2253	void	2100	void
2254	send_spell_paths (client_socket * ns, char *params)	2101	send_spell_paths (client * ns, char *params)
2255	{	2102	{
2256	packet sl;	2103	packet sl;
2257		2104
2258	sl << "replyinfo spell_paths\n";	2105	sl << "replyinfo spell_paths\n";
2259		2106
…		…
2399		2246
2400	if (!pl->socket->monitor_spells)	2247	if (!pl->socket->monitor_spells)
2401	return;	2248	return;
2402		2249
2403	packet sl;	2250	packet sl;
2404
2405	sl << "addspell ";	2251	sl << "addspell ";
2406		2252
2407	if (!spell)	2253	if (!spell)
2408	{	2254	{
2409	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	2255	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.38 by root, Thu Dec 14 22:45:41 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.38 by root, Thu Dec 14 22:45:41 2006 UTC vs.
Revision 1.45 by root, Tue Dec 19 04:58:05 2006 UTC