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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.39 by root, Fri Dec 15 03:53:44 2006 UTC vs.
Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC

…		…
38	* esrv_map_new starts updating the map	38	* esrv_map_new starts updating the map
39	*	39	*
40	* esrv_map_setbelow allows filling in all of the faces for the map.	40	* esrv_map_setbelow allows filling in all of the faces for the map.
41	* if a face has not already been sent to the client, it is sent now.	41	* if a face has not already been sent to the client, it is sent now.
42	*	42	*
43	* mapcellchanged, compactlayer, compactstack, perform the map compressing
44	* operations
45	*
46	*/	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	{
…		…
214	}	204	}
215	}	205	}
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;
		209	}
		210
		211	/**
		212	* RequestInfo is sort of a meta command. There is some specific
		213	* request of information, but we call other functions to provide
		214	* that information.
		215	*/
		216	void
		217	RequestInfo (char buf, int len, client ns)
		218	{
		219	char params = NULL, cp;
		220
		221	/* No match */
		222	char bigbuf[MAX_BUF];
		223	int slen;
		224
		225	/* Set up replyinfo before we modify any of the buffers - this is used
		226	* if we don't find a match.
		227	*/
		228	strcpy (bigbuf, "replyinfo ");
		229	slen = strlen (bigbuf);
		230	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
		231
		232	/* find the first space, make it null, and update the
		233	* params pointer.
		234	*/
		235	for (cp = buf; *cp != '\0'; cp++)
		236	if (*cp == ' ')
		237	{
		238	*cp = '\0';
		239	params = cp + 1;
		240	break;
		241	}
		242
		243	if (!strcmp (buf, "image_info"))
		244	send_image_info (ns, params);
		245	else if (!strcmp (buf, "image_sums"))
		246	send_image_sums (ns, params);
		247	else if (!strcmp (buf, "skill_info"))
		248	send_skill_info (ns, params);
		249	else if (!strcmp (buf, "spell_paths"))
		250	send_spell_paths (ns, params);
		251	else
		252	ns->send_packet (bigbuf, len);
219	}	253	}
220		254
221	void	255	void
222	ExtCmd (char buf, int len, player pl)	256	ExtCmd (char buf, int len, player pl)
223	{	257	{
…		…
311	pl->socket->send_packet (bigbuf);	345	pl->socket->send_packet (bigbuf);
312	}	346	}
313		347
314	/** This is the Setup cmd - easy first implementation */	348	/** This is the Setup cmd - easy first implementation */
315	void	349	void
316	SetUp (char buf, int len, client_socket ns)	350	SetUp (char buf, int len, client ns)
317	{	351	{
318	int s, slen;	352	int s, slen;
319	char cmd, param, cmdback[HUGE_BUF];	353	char cmd, param, cmdback[HUGE_BUF];
320		354
321	/* run through the cmds of setup	355	/* run through the cmds of setup
…		…
531	* This is what takes care of it. We tell the client how things worked out.	565	* This is what takes care of it. We tell the client how things worked out.
532	* I am not sure if this file is the best place for this function. however,	566	* I am not sure if this file is the best place for this function. however,
533	* it either has to be here or init_sockets needs to be exported.	567	* it either has to be here or init_sockets needs to be exported.
534	*/	568	*/
535	void	569	void
536	AddMeCmd (char buf, int len, client_socket ns)	570	AddMeCmd (char buf, int len, client ns)
537	{	571	{
538	Settings oldsettings;
539
540	oldsettings = settings;
541	if (ns->status != Ns_Add \|\| add_player (ns))	572	if (ns->status != Ns_Add \|\| add_player (ns))
542	ns->send_packet ("addme_failed");	573	ns->send_packet ("addme_failed");
543	else	574	else
544	ns->send_packet ("addme_success");	575	ns->send_packet ("addme_success");
545
546	settings = oldsettings;
547	}	576	}
548		577
549	/** Reply to ExtendedInfos command */	578	/** Reply to ExtendedInfos command */
550	void	579	void
551	ToggleExtendedInfos (char buf, int len, client_socket ns)	580	ToggleExtendedInfos (char buf, int len, client ns)
552	{	581	{
553	char cmdback[MAX_BUF];	582	char cmdback[MAX_BUF];
554	char command[50];	583	char command[50];
555	int info, nextinfo;	584	int info, nextinfo;
556		585
…		…
607	#define MSG_TYPE_MONUMENT 5	636	#define MSG_TYPE_MONUMENT 5
608	#define MSG_TYPE_SCRIPTED_DIALOG 6*/	637	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
609		638
610	/** Reply to ExtendedInfos command */	639	/** Reply to ExtendedInfos command */
611	void	640	void
612	ToggleExtendedText (char buf, int len, client_socket ns)	641	ToggleExtendedText (char buf, int len, client ns)
613	{	642	{
614	char cmdback[MAX_BUF];	643	char cmdback[MAX_BUF];
615	char temp[10];	644	char temp[10];
616	char command[50];	645	char command[50];
617	int info, nextinfo, i, flag;	646	int info, nextinfo, i, flag;
…		…
668	* a piece of data from us that we know the client wants. So	697	* a piece of data from us that we know the client wants. So
669	* if we know the client wants it, might as well push it to the	698	* if we know the client wants it, might as well push it to the
670	* client.	699	* client.
671	*/	700	*/
672	static void	701	static void
673	SendSmooth (client_socket * ns, uint16 face)	702	SendSmooth (client *ns, uint16 face)
674	{	703	{
675	uint16 smoothface;	704	uint16 smoothface;
676		705
677	/* If we can't find a face, return and set it so we won't try to send this	706	/* If we can't find a face, return and set it so we won't try to send this
678	* again.	707	* again.
…		…
702	/**	731	/**
703	* Tells client the picture it has to use	732	* Tells client the picture it has to use
704	* to smooth a picture number given as argument.	733	* to smooth a picture number given as argument.
705	*/	734	*/
706	void	735	void
707	AskSmooth (char buf, int len, client_socket ns)	736	AskSmooth (char buf, int len, client ns)
708	{	737	{
709	uint16 facenbr;	738	SendSmooth (ns, atoi (buf));
710
711	facenbr = atoi (buf);
712	SendSmooth (ns, facenbr);
713	}	739	}
714		740
715	/**	741	/**
716	* This handles the general commands from the client (ie, north, fire, cast,	742	* This handles the general commands from the client (ie, north, fire, cast,
717	* etc.)	743	* etc.)
718	*/	744	*/
719	void	745	void
720	PlayerCmd (char buf, int len, player pl)	746	PlayerCmd (char buf, int len, player pl)
721	{	747	{
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	748	/* Check if there is a count. In theory, a zero count could also be
734	* sent, so check for that also.	749	* sent, so check for that also.
735	*/	750	*/
736	if (atoi (buf) \|\| buf[0] == '0')	751	if (atoi (buf) \|\| buf[0] == '0')
737	{	752	{
738	pl->count = atoi ((char *) buf);	753	pl->count = atoi ((char *) buf);
		754
739	buf = strchr (buf, ' '); /* advance beyond the numbers */	755	buf = strchr (buf, ' '); /* advance beyond the numbers */
740	if (!buf)	756	if (!buf)
741	{
742	#ifdef ESRV_DEBUG
743	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
744	#endif
745	return;	757	return;
746	}	758
747	buf++;	759	buf++;
748	}	760	}
749	/* This should not happen anymore. */	761
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);	762	execute_newserver_command (pl->ob, (char *) buf);
		763
756	/* Perhaps something better should be done with a left over count.	764	/* Perhaps something better should be done with a left over count.
757	* Cleaning up the input should probably be done first - all actions	765	* 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	766	* for the command that issued the count should be done before any other
759	* commands.	767	* commands.
760	*/	768	*/
761
762	pl->count = 0;	769	pl->count = 0;
763
764	}	770	}
765		771
766		772
767	/**	773	/**
768	* This handles the general commands from the client (ie, north, fire, cast,	774	* This handles the general commands from the client (ie, north, fire, cast,
…		…
771	* can throttle.	777	* can throttle.
772	*/	778	*/
773	void	779	void
774	NewPlayerCmd (char buf, int len, player pl)	780	NewPlayerCmd (char buf, int len, player pl)
775	{	781	{
776	int time, repeat;
777	char command[MAX_BUF];
778	int pktlen;
779
780	if (len < 7)	782	if (len <= 6)
781	{	783	{
782	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	784	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
783	return;	785	return;
784	}	786	}
785		787
786	pktlen = net_uint16 ((uint8 *)buf);	788	uint16 cmdid = net_uint16 ((uint8 *)buf);
787	repeat = net_uint32 ((uint8 *)buf + 2);	789	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
788		790
789	/* -1 is special - no repeat, but don't update */	791	/* -1 is special - no repeat, but don't update */
790	if (repeat != -1)	792	if (repeat != -1)
791	pl->count = repeat;	793	pl->count = repeat;
792		794
793	if ((len - 4) >= MAX_BUF)	795	buf += 6; //len -= 6;
794	len = MAX_BUF - 5;
795		796
796	strncpy ((char ) command, (char ) buf + 6, len - 4);
797	command[len - 4] = 0;
798
799	/* This should not happen anymore. */
800	if (pl->ob->speed_left < -1.0)
801	LOG (llevError, "Player has negative time - shouldn't do command.\n");
802
803	/* In c_new.c */
804	execute_newserver_command (pl->ob, (char *) command);	797	execute_newserver_command (pl->ob, buf);
		798
805	/* Perhaps something better should be done with a left over count.	799	/* Perhaps something better should be done with a left over count.
806	* Cleaning up the input should probably be done first - all actions	800	* Cleaning up the input should probably be done first - all actions
807	* for the command that issued the count should be done before any other	801	* for the command that issued the count should be done before any other
808	* commands.	802	* commands.
809	*/	803	*/
810	pl->count = 0;	804	pl->count = 0;
811		805
		806	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
812	if (FABS (pl->ob->speed) < 0.001)	807	int time = FABS (pl->ob->speed) < 0.001
813	time = MAX_TIME * 100;	808	? time = MAX_TIME * 100
814	else
815	time = (int) (MAX_TIME / FABS (pl->ob->speed));	809	: time = (int) (MAX_TIME / FABS (pl->ob->speed));
816		810
817	/* Send confirmation of command execution now */	811	/* Send confirmation of command execution now */
818
819	packet sl;	812	packet sl;
820	sl << "comc " << uint16 (pktlen) << uint32 (time);	813	sl << "comc " << uint16 (cmdid) << uint32 (time);
821	pl->socket->send_packet (sl);	814	pl->socket->send_packet (sl);
822	}	815	}
823		816
824		817
825	/** This is a reply to a previous query. */	818	/** This is a reply to a previous query. */
826	void	819	void
827	ReplyCmd (char buf, int len, player pl)	820	ReplyCmd (char buf, int len, player pl)
828	{	821	{
829	/* This is to synthesize how the data would be stored if it	822	/* This is to synthesize how the data would be stored if it
830	* was normally entered. A bit of a hack, and should be cleaned up	823	* was normally entered. A bit of a hack, and should be cleaned up
831	* once all the X11 code is removed from the server.	824	* once all the X11 code is removed from the server.
832	*	825	*
833	* We pass 13 to many of the functions because this way they	826	* We pass 13 to many of the functions because this way they
834	* think it was the carriage return that was entered, and the	827	* think it was the carriage return that was entered, and the
835	* function then does not try to do additional input.	828	* function then does not try to do additional input.
…		…
838		831
839	/* this avoids any hacking here */	832	/* this avoids any hacking here */
840		833
841	switch (pl->state)	834	switch (pl->state)
842	{	835	{
843	case ST_PLAYING:	836	case ST_PLAYING:
844	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	837	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
845	break;	838	break;
846		839
847	case ST_PLAY_AGAIN:	840	case ST_PLAY_AGAIN:
848	/* We can check this for return value (2==quit). Maybe we	841	/* We can check this for return value (2==quit). Maybe we
849	* should, and do something appropriate?	842	* should, and do something appropriate?
850	*/	843	*/
851	receive_play_again (pl->ob, buf[0]);	844	receive_play_again (pl->ob, buf[0]);
852	break;	845	break;
853		846
854	case ST_ROLL_STAT:	847	case ST_ROLL_STAT:
855	key_roll_stat (pl->ob, buf[0]);	848	key_roll_stat (pl->ob, buf[0]);
856	break;	849	break;
857		850
858	case ST_CHANGE_CLASS:	851	case ST_CHANGE_CLASS:
859		852
860	key_change_class (pl->ob, buf[0]);	853	key_change_class (pl->ob, buf[0]);
861	break;	854	break;
862		855
863	case ST_CONFIRM_QUIT:	856	case ST_CONFIRM_QUIT:
864	key_confirm_quit (pl->ob, buf[0]);	857	key_confirm_quit (pl->ob, buf[0]);
865	break;	858	break;
866		859
867	case ST_CONFIGURE:	860	case ST_CONFIGURE:
868	LOG (llevError, "In client input handling, but into configure state\n");	861	LOG (llevError, "In client input handling, but into configure state\n");
869	pl->state = ST_PLAYING;	862	pl->state = ST_PLAYING;
870	break;	863	break;
871		864
872	case ST_GET_NAME:	865	case ST_GET_NAME:
873	receive_player_name (pl->ob, 13);	866	receive_player_name (pl->ob, 13);
874	break;	867	break;
875		868
876	case ST_GET_PASSWORD:	869	case ST_GET_PASSWORD:
877	case ST_CONFIRM_PASSWORD:	870	case ST_CONFIRM_PASSWORD:
878	receive_player_password (pl->ob, 13);	871	receive_player_password (pl->ob, 13);
879	break;	872	break;
880		873
881	case ST_GET_PARTY_PASSWORD: /* Get password for party */	874	case ST_GET_PARTY_PASSWORD: /* Get password for party */
882	receive_party_password (pl->ob, 13);	875	receive_party_password (pl->ob, 13);
883	break;	876	break;
884		877
885	default:	878	default:
886	LOG (llevError, "Unknown input state: %d\n", pl->state);	879	LOG (llevError, "Unknown input state: %d\n", pl->state);
887	}	880	}
888	}	881	}
889		882
890	/**	883	/**
891	* Client tells its version. If there is a mismatch, we close the	884	* Client tells its version. If there is a mismatch, we close the
…		…
893	* something older than the server. If we assume the client will be	886	* something older than the server. If we assume the client will be
894	* backwards compatible, having it be a later version should not be a	887	* backwards compatible, having it be a later version should not be a
895	* problem.	888	* problem.
896	*/	889	*/
897	void	890	void
898	VersionCmd (char buf, int len, client_socket ns)	891	VersionCmd (char buf, int len, client ns)
899	{	892	{
900	char *cp;
901	char version_warning[256];
902
903	if (!buf)	893	if (!buf)
904	{	894	{
905	LOG (llevError, "CS: received corrupted version command\n");	895	LOG (llevError, "CS: received corrupted version command\n");
906	return;	896	return;
907	}	897	}
908		898
909	ns->cs_version = atoi (buf);	899	ns->cs_version = atoi (buf);
910	ns->sc_version = ns->cs_version;	900	ns->sc_version = ns->cs_version;
		901
		902	LOG (llevDebug, "connection from client <%s>\n", buf);
		903
		904
		905	//TODO: should log here just for statistics
		906
911	if (VERSION_CS != ns->cs_version)	907	//if (VERSION_CS != ns->cs_version)
912	{	908	// unchecked;
913	#ifdef ESRV_DEBUG	909
914	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
915	#endif
916	}
917	cp = strchr (buf + 1, ' ');	910	char *cp = strchr (buf + 1, ' ');
918	if (!cp)	911	if (!cp)
919	return;	912	return;
		913
920	ns->sc_version = atoi (cp);	914	ns->sc_version = atoi (cp);
		915
921	if (VERSION_SC != ns->sc_version)	916	//if (VERSION_SC != ns->sc_version)
922	{	917	// unchecked;
923	#ifdef ESRV_DEBUG	918
924	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
925	#endif
926	}
927	cp = strchr (cp + 1, ' ');	919	cp = strchr (cp + 1, ' ');
		920
928	if (cp)	921	if (cp)
929	{	922	{
930	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);	923	assign (ns->version, cp + 1);
931		924
932	snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
933
934	/* This is first implementation - i skip all beta DX clients with it
935	* Add later stuff here for other clients
936	*/
937
938	/* these are old dxclients */
939	/* Version 1024 added support for singular + plural name values -
940	* requiing this minimal value reduces complexity of that code, and it
941	* has been around for a long time.
942	*/
943	if (ns->sc_version < 1026)	925	if (ns->sc_version < 1026)
944	{	926	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
945	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
946	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");	927	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
947	ns->send_packet (version_warning);
948	}
949
950	}	928	}
951	}	929	}
952		930
953	/** sound related functions. */	931	/** sound related functions. */
954
955	void	932	void
956	SetSound (char buf, int len, client_socket ns)	933	SetSound (char buf, int len, client ns)
957	{	934	{
958	ns->sound = atoi (buf);	935	ns->sound = atoi (buf);
959	}	936	}
960		937
961	/** client wants the map resent */	938	/** client wants the map resent */
962		939
963	void	940	void
964	MapRedrawCmd (char buf, int len, player pl)	941	MapRedrawCmd (char buf, int len, player pl)
965	{	942	{
966
967	/* This function is currently disabled; just clearing the map state results in	943	/* This function is currently disabled; just clearing the map state results in
968	* display errors. It should clear the cache and send a newmap command.	944	* display errors. It should clear the cache and send a newmap command.
969	* Unfortunately this solution does not work because some client versions send	945	* Unfortunately this solution does not work because some client versions send
970	* a mapredraw command after receiving a newmap command.	946	* a mapredraw command after receiving a newmap command.
971	*/	947	*/
972	#if 0
973	/* Okay, this is MAJOR UGLY. but the only way I know how to
974	* clear the "cache"
975	*/
976	memset (&pl->socket->lastmap, 0, sizeof (struct Map));
977	draw_client_map (pl->ob);
978	#endif
979	}	948	}
980		949
981	/**	950	/**
982	* Moves an object (typically, container to inventory).	951	* Moves an object (typically, container to inventory).
983	* syntax is: move (to) (tag) (nrof)	952	* syntax is: move (to) (tag) (nrof)
…		…
986	MoveCmd (char buf, int len, player pl)	955	MoveCmd (char buf, int len, player pl)
987	{	956	{
988	int vals[3], i;	957	int vals[3], i;
989		958
990	/* A little funky here. We only cycle for 2 records, because	959	/* A little funky here. We only cycle for 2 records, because
991	* we obviously am not going to find a space after the third	960	* we obviously are not going to find a space after the third
992	* record. Perhaps we should just replace this with a	961	* record. Perhaps we should just replace this with a
993	* sscanf?	962	* sscanf?
994	*/	963	*/
995	for (i = 0; i < 2; i++)	964	for (i = 0; i < 2; i++)
996	{	965	{
997	vals[i] = atoi (buf);	966	vals[i] = atoi (buf);
		967
998	if (!(buf = strchr (buf, ' ')))	968	if (!(buf = strchr (buf, ' ')))
999	{	969	{
1000	LOG (llevError, "Incomplete move command: %s\n", buf);	970	LOG (llevError, "Incomplete move command: %s\n", buf);
1001	return;	971	return;
1002	}	972	}
		973
1003	buf++;	974	buf++;
1004	}	975	}
		976
1005	vals[2] = atoi (buf);	977	vals[2] = atoi (buf);
1006		978
1007	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/	979	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1008	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	980	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1009	}	981	}
1010
1011
1012		982
1013	/******************************************************************************	983	/******************************************************************************
1014	*	984	*
1015	* Start of commands the server sends to the client.	985	* Start of commands the server sends to the client.
1016	*	986	*
…		…
1019	/**	989	/**
1020	* Asks the client to query the user. This way, the client knows	990	* Asks the client to query the user. This way, the client knows
1021	* it needs to send something back (vs just printing out a message)	991	* it needs to send something back (vs just printing out a message)
1022	*/	992	*/
1023	void	993	void
1024	send_query (client_socket * ns, uint8 flags, char *text)	994	send_query (client ns, uint8 flags, char text)
1025	{	995	{
1026	char buf[MAX_BUF];
1027
1028	sprintf (buf, "query %d %s", flags, text ? text : "");	996	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1029	ns->send_packet (buf);
1030	}	997	}
1031		998
1032	#define AddIfInt64(Old,New,Type) if (Old != New) {\	999	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1033	Old = New; \	1000	Old = New; \
1034	sl << uint8 (Type) << uint64 (New); \	1001	sl << uint8 (Type) << uint64 (New); \
…		…
1067	uint16 flags;	1034	uint16 flags;
1068		1035
1069	packet sl;	1036	packet sl;
1070	sl << "stats ";	1037	sl << "stats ";
1071		1038
1072	if (pl->ob != NULL)	1039	if (pl->ob)
1073	{	1040	{
1074	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1041	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1075	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1042	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1076	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1043	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1077	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1044	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
…		…
1085	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1052	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1086	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1053	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1087	}	1054	}
1088		1055
1089	if (pl->socket->exp64)	1056	if (pl->socket->exp64)
1090	{
1091	uint8 s;
1092
1093	for (s = 0; s < NUM_SKILLS; s++)	1057	for (int s = 0; s < NUM_SKILLS; s++)
1094	{
1095	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1058	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1096	{	1059	{
1097	/* Always send along the level if exp changes. This is only	1060	/* Always send along the level if exp changes. This is only
1098	* 1 extra byte, but keeps processing simpler.	1061	* 1 extra byte, but keeps processing simpler.
1099	*/	1062	*/
1100	sl << uint8 (s + CS_STAT_SKILLINFO)	1063	sl << uint8 (s + CS_STAT_SKILLINFO)
1101	<< uint8 (pl->last_skill_ob[s]->level)	1064	<< uint8 (pl->last_skill_ob[s]->level)
1102	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1065	<< uint64 (pl->last_skill_ob[s]->stats.exp);
1103		1066
1104	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;	1067	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1105	}	1068	}
1106	}
1107	}
1108		1069
1109	if (pl->socket->exp64)	1070	if (pl->socket->exp64)
1110	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1071	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1111	else	1072	else
1112	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }	1073	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
…		…
1130	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1091	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1131		1092
1132	if (pl->socket->sc_version < 1025)	1093	if (pl->socket->sc_version < 1025)
1133	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1094	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1134	else	1095	else
1135	{
1136	int i;
1137
1138	for (i = 0; i < NROFATTACKS; i++)	1096	for (int i = 0; i < NROFATTACKS; i++)
1139	{	1097	{
1140	/* Skip ones we won't send */	1098	/* Skip ones we won't send */
1141	if (atnr_cs_stat[i] == -1)	1099	if (atnr_cs_stat[i] == -1)
1142	continue;	1100	continue;
1143		1101
1144	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1102	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1145	}	1103	}
1146	}
1147		1104
1148	if (pl->socket->monitor_spells)	1105	if (pl->socket->monitor_spells)
1149	{	1106	{
1150	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1107	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1151	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1108	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
…		…
1188	* sent them the face yet (this can become quite costly in terms of	1145	* sent them the face yet (this can become quite costly in terms of
1189	* how much we are sending - on the other hand, this should only happen	1146	* how much we are sending - on the other hand, this should only happen
1190	* when the player logs in and picks stuff up.	1147	* when the player logs in and picks stuff up.
1191	*/	1148	*/
1192	void	1149	void
1193	esrv_send_animation (client_socket * ns, short anim_num)	1150	esrv_send_animation (client * ns, short anim_num)
1194	{	1151	{
1195	int i;
1196
1197	/* Do some checking on the anim_num we got. Note that the animations	1152	/* Do some checking on the anim_num we got. Note that the animations
1198	* are added in contigous order, so if the number is in the valid	1153	* are added in contigous order, so if the number is in the valid
1199	* range, it must be a valid animation.	1154	* range, it must be a valid animation.
1200	*/	1155	*/
1201	if (anim_num < 0 \|\| anim_num > num_animations)	1156	if (anim_num < 0 \|\| anim_num > num_animations)
…		…
1211	<< uint16 (0); /* flags - not used right now */	1166	<< uint16 (0); /* flags - not used right now */
1212		1167
1213	/* Build up the list of faces. Also, send any information (ie, the	1168	/* Build up the list of faces. Also, send any information (ie, the
1214	* the face itself) down to the client.	1169	* the face itself) down to the client.
1215	*/	1170	*/
1216	for (i = 0; i < animations[anim_num].num_animations; i++)	1171	for (int i = 0; i < animations[anim_num].num_animations; i++)
1217	{	1172	{
1218	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))	1173	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1219	esrv_send_face (ns, animations[anim_num].faces[i], 0);	1174	esrv_send_face (ns, animations[anim_num].faces[i], 0);
		1175
1220	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */	1176	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1221	}	1177	}
1222		1178
1223	ns->send_packet (sl);	1179	ns->send_packet (sl);
1224		1180
…		…
1235	/**	1191	/**
1236	* This adds face_num to a map cell at x,y. If the client doesn't have	1192	* This adds face_num to a map cell at x,y. If the client doesn't have
1237	* the face yet, we will also send it.	1193	* the face yet, we will also send it.
1238	*/	1194	*/
1239	static void	1195	static void
1240	esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)	1196	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1241	{	1197	{
1242	if (newmap->cells[x][y].count >= MAP_LAYERS)	1198	if (newmap->cells[x][y].count >= MAP_LAYERS)
1243	{	1199	{
		1200	//TODO: one or the other, can't both have abort and return, verify and act
1244	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);	1201	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1245	return;	1202	return;
1246	abort ();	1203	abort ();
1247	}	1204	}
1248		1205
1249	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;	1206	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1250	newmap->cells[x][y].count++;	1207	newmap->cells[x][y].count++;
1251		1208
1252	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))	1209	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1253	esrv_send_face (ns, face_num, 0);	1210	esrv_send_face (ns, face_num, 0);
1254	}
1255
1256	struct LayerCell
1257	{
1258	uint16 xy;
1259	short face;
1260	};
1261
1262	struct MapLayer
1263	{
1264	int count;
1265	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1266	};
1267
1268	/** Checkes if map cells have changed */
1269	static int
1270	mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1271	{
1272	int k;
1273
1274	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1275	return 1;
1276	for (k = 0; k < newmap->cells[i][j].count; k++)
1277	{
1278	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1279	{
1280	return 1;
1281	}
1282	}
1283	return 0;
1284	}
1285
1286	/**
1287	* Basically, what this does is pack the data into layers.
1288	* cnum is the client number, cur is the the buffer we put all of
1289	* this data into. we return the end of the data. layers is
1290	* how many layers of data we should back.
1291	*/
1292	static uint8 *
1293	compactlayer (client_socket * ns, unsigned char cur, int numlayers, struct Map newmap)
1294	{
1295	int x, y, k;
1296	int face;
1297	unsigned char *fcur;
1298	struct MapLayer layers[MAP_LAYERS];
1299
1300	for (k = 0; k < MAP_LAYERS; k++)
1301	layers[k].count = 0;
1302	fcur = cur;
1303	for (x = 0; x < ns->mapx; x++)
1304	{
1305	for (y = 0; y < ns->mapy; y++)
1306	{
1307	if (!mapcellchanged (ns, x, y, newmap))
1308	continue;
1309	if (newmap->cells[x][y].count == 0)
1310	{
1311	cur = x ns->mapy + y; /* mark empty space */
1312	cur++;
1313	continue;
1314	}
1315	for (k = 0; k < newmap->cells[x][y].count; k++)
1316	{
1317	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1318	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1319	layers[k].count++;
1320	}
1321	}
1322	}
1323	/* If no data, return now. */
1324	if (fcur == cur && layers[0].count == 0)
1325	return cur;
1326	cur = 255; / mark end of explicitly cleared cells */
1327	cur++;
1328	/* First pack by layers. */
1329	for (k = 0; k < numlayers; k++)
1330	{
1331	if (layers[k].count == 0)
1332	break; /* once a layer is entirely empty, no layer below it can
1333	have anything in it either */
1334	/* Pack by entries in thie layer */
1335	for (x = 0; x < layers[k].count;)
1336	{
1337	fcur = cur;
1338	*cur = layers[k].lcells[x].face >> 8;
1339	cur++;
1340	*cur = layers[k].lcells[x].face & 0xFF;
1341	cur++;
1342	face = layers[k].lcells[x].face;
1343	/* Now, we back the redundant data into 1 byte xy pairings */
1344	for (y = x; y < layers[k].count; y++)
1345	{
1346	if (layers[k].lcells[y].face == face)
1347	{
1348	*cur = (uint8) layers[k].lcells[y].xy;
1349	cur++;
1350	layers[k].lcells[y].face = -1;
1351	}
1352	}
1353	(cur - 1) = (cur - 1) \| 128; /* mark for end of xy's; 1111 < 128 /
1354	/* forward over the now redundant data */
1355	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1356	x++;
1357	}
1358	fcur = fcur \| 128; /* mark for end of faces at this layer */
1359	}
1360	return cur;
1361	}	1211	}
1362		1212
1363	/** Clears a map cell */	1213	/** Clears a map cell */
1364	static void	1214	static void
1365	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1215	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
…		…
1377	#define MAX_LAYERS 3	1227	#define MAX_LAYERS 3
1378		1228
1379	/* Using a global really isn't a good approach, but saves the over head of	1229	/* Using a global really isn't a good approach, but saves the over head of
1380	* allocating and deallocating such a block of data each time run through,	1230	* allocating and deallocating such a block of data each time run through,
1381	* and saves the space of allocating this in the socket object when we only	1231	* and saves the space of allocating this in the socket object when we only
1382	* need it for this cycle. If the serve is ever threaded, this needs to be	1232	* need it for this cycle. If the server is ever threaded, this needs to be
1383	* re-examined.	1233	* re-examined.
1384	*/	1234	*/
1385
1386	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];	1235	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];
1387		1236
1388	/**	1237	/**
1389	* Returns true if any of the heads for this	1238	* Returns true if any of the heads for this
1390	* space is set. Returns false if all are blank - this is used	1239	* space is set. Returns false if all are blank - this is used
1391	* for empty space checking.	1240	* for empty space checking.
1392	*/	1241	*/
1393	static inline int	1242	static inline int
1394	have_head (int ax, int ay)	1243	have_head (int ax, int ay)
1395	{	1244	{
1396
1397	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|	1245	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|
1398	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] \|\| heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])	1246	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] \|\| heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1399	return 1;	1247	return 1;
		1248
1400	return 0;	1249	return 0;
1401	}	1250	}
1402		1251
1403	/**	1252	/**
1404	* check_head is a bit simplistic version of update_space below.	1253	* check_head is a bit simplistic version of update_space below.
1405	* basically, it only checks the that the head on space ax,ay at layer	1254	* basically, it only checks the that the head on space ax,ay at layer
1406	* needs to get sent - if so, it adds the data, sending the head	1255	* needs to get sent - if so, it adds the data, sending the head
1407	* if needed, and returning 1. If this no data needs to get	1256	* if needed, and returning 1. If this no data needs to get
1408	* sent, it returns zero.	1257	* sent, it returns zero.
1409	*/	1258	*/
1410	static int	1259	static int
1411	check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)	1260	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1412	{	1261	{
1413	short face_num;	1262	short face_num;
1414		1263
1415	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])	1264	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1416	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;	1265	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
…		…
1448	* numbers the spaces differently - I think this was a leftover from	1297	* numbers the spaces differently - I think this was a leftover from
1449	* the map command, where the faces stack up. Sinces that is no longer	1298	* the map command, where the faces stack up. Sinces that is no longer
1450	* the case, it seems to make more sense to have these layer values	1299	* the case, it seems to make more sense to have these layer values
1451	* actually match.	1300	* actually match.
1452	*/	1301	*/
1453
1454	static int	1302	static int
1455	update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1303	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1456	{	1304	{
1457	object ob, head;	1305	object ob, head;
1458	uint16 face_num;	1306	uint16 face_num;
1459	int bx, by, i;	1307	int bx, by, i;
1460		1308
…		…
1673	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ	1521	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1674	* take.	1522	* take.
1675	*/	1523	*/
1676		1524
1677	static inline int	1525	static inline int
1678	update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1526	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1679	{	1527	{
1680	object *ob;	1528	object *ob;
1681	int smoothlevel; /* old face_num; */	1529	int smoothlevel; /* old face_num; */
1682		1530
1683	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1531	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
…		…
1717	* Returns the size of a data for a map square as returned by	1565	* Returns the size of a data for a map square as returned by
1718	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries	1566	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
1719	* available.	1567	* available.
1720	*/	1568	*/
1721	int	1569	int
1722	getExtendedMapInfoSize (client_socket * ns)	1570	getExtendedMapInfoSize (client * ns)
1723	{	1571	{
1724	int result = 0;	1572	int result = 0;
1725		1573
1726	if (ns->ext_mapinfos)	1574	if (ns->ext_mapinfos)
1727	{	1575	{
1728	if (ns->EMI_smooth)	1576	if (ns->EMI_smooth)
1729	result += 1; /One byte for smoothlevel /	1577	result += 1; /One byte for smoothlevel /
1730	}	1578	}
		1579
1731	return result;	1580	return result;
1732	}	1581	}
1733		1582
1734	/**	1583	/**
1735	* This function uses the new map1 protocol command to send the map	1584	* This function uses the new map1 protocol command to send the map
…		…
1763	uint8 eentrysize;	1612	uint8 eentrysize;
1764	uint16 ewhatstart, ewhatflag;	1613	uint16 ewhatstart, ewhatflag;
1765	uint8 extendedinfos;	1614	uint8 extendedinfos;
1766	maptile *m;	1615	maptile *m;
1767		1616
1768	client_socket &socket = *pl->contr->socket;	1617	client &socket = *pl->contr->socket;
1769		1618
1770	check_map_change (pl->contr);	1619	check_map_change (pl->contr);
1771		1620
1772	packet sl;	1621	packet sl;
1773	packet esl;	1622	packet esl;
…		…
2172	{	2021	{
2173	ax = i;	2022	ax = i;
2174	ay = j;	2023	ay = j;
2175	m = pm;	2024	m = pm;
2176	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	2025	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		2026
2177	if (mflags & P_OUT_OF_MAP)	2027	if (mflags & P_OUT_OF_MAP)
2178	continue;	2028	continue;
		2029
2179	if (mflags & P_NEED_UPDATE)	2030	if (mflags & P_NEED_UPDATE)
2180	update_position (m, ax, ay);	2031	update_position (m, ax, ay);
		2032
2181	/* If a map is visible to the player, we don't want to swap it out	2033	/* If a map is visible to the player, we don't want to swap it out
2182	* just to reload it. This should really call something like	2034	* just to reload it. This should really call something like
2183	* swap_map, but this is much more efficient and 'good enough'	2035	* swap_map, but this is much more efficient and 'good enough'
2184	*/	2036	*/
2185	if (mflags & P_NEW_MAP)	2037	if (mflags & P_NEW_MAP)
…		…
2216	/**	2068	/**
2217	* This sends the skill number to name mapping. We ignore	2069	* This sends the skill number to name mapping. We ignore
2218	* the params - we always send the same info no matter what.	2070	* the params - we always send the same info no matter what.
2219	*/	2071	*/
2220	void	2072	void
2221	send_skill_info (client_socket ns, char params)	2073	send_skill_info (client ns, char params)
2222	{	2074	{
2223	packet sl;	2075	packet sl;
2224	sl << "replyinfo skill_info\n";	2076	sl << "replyinfo skill_info\n";
2225		2077
2226	for (int i = 1; i < NUM_SKILLS; i++)	2078	for (int i = 1; i < NUM_SKILLS; i++)
…		…
2238	/**	2090	/**
2239	* This sends the spell path to name mapping. We ignore	2091	* This sends the spell path to name mapping. We ignore
2240	* the params - we always send the same info no matter what.	2092	* the params - we always send the same info no matter what.
2241	*/	2093	*/
2242	void	2094	void
2243	send_spell_paths (client_socket * ns, char *params)	2095	send_spell_paths (client * ns, char *params)
2244	{	2096	{
2245	packet sl;	2097	packet sl;
2246		2098
2247	sl << "replyinfo spell_paths\n";	2099	sl << "replyinfo spell_paths\n";
2248		2100
…		…
2388		2240
2389	if (!pl->socket->monitor_spells)	2241	if (!pl->socket->monitor_spells)
2390	return;	2242	return;
2391		2243
2392	packet sl;	2244	packet sl;
2393
2394	sl << "addspell ";	2245	sl << "addspell ";
2395		2246
2396	if (!spell)	2247	if (!spell)
2397	{	2248	{
2398	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	2249	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.39 by root, Fri Dec 15 03:53:44 2006 UTC vs. Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.39 by root, Fri Dec 15 03:53:44 2006 UTC vs.
Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC