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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.59 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.80 by root, Fri Mar 16 02:51:08 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5	Copyright (C) 2001 Mark Wedel	5	* Copyright (C) 2001 Mark Wedel
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
7		7	*
8	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	(at your option) any later version.	11	* (at your option) any later version.
12		12	*
13	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.	16	* GNU General Public License for more details.
17		17	*
18	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		21	*
22	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author can be reached via e-mail to <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	/**	25	/**
26	* \file	26	* \file
27	* Client handling.	27	* Client handling.
28	*	28	*
36	* have the prototype of (char *data, int datalen, int client_num). This	36	* have the prototype of (char *data, int datalen, int client_num). This
37	* way, we can use one dispatch table.	37	* way, we can use one dispatch table.
38	*	38	*
39	* esrv_map_new starts updating the map	39	* esrv_map_new starts updating the map
40	*	40	*
41	* esrv_map_setbelow allows filling in all of the faces for the map.
42	* if a face has not already been sent to the client, it is sent now.
43	*
44	*/	41	*/
45		42
46	#include <global.h>	43	#include <global.h>
47	#include <sproto.h>	44	#include <sproto.h>
48		45
…		…
101	* that much difference in bandwidth.	98	* that much difference in bandwidth.
102	*/	99	*/
103	mx = ns->mapx;	100	mx = ns->mapx;
104	my = ns->mapy;	101	my = ns->mapy;
105		102
106	if (ns->mapmode == Map1aCmd)
107	{
108	mx += MAX_HEAD_OFFSET;
109	my += MAX_HEAD_OFFSET;
110	}
111
112	/* the x and y here are coordinates for the new map, i.e. if we moved	103	/* the x and y here are coordinates for the new map, i.e. if we moved
113	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	104	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
114	* if the destination x or y coordinate is outside the viewable	105	* if the destination x or y coordinate is outside the viewable
115	* area, we clear the values - otherwise, the old values	106	* area, we clear the values - otherwise, the old values
116	* are preserved, and the check_head thinks it needs to clear them.	107	* are preserved, and the check_head thinks it needs to clear them.
…		…
141	static void	132	static void
142	clear_map (player *pl)	133	clear_map (player *pl)
143	{	134	{
144	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
145		136
		137	pl->ns->force_newmap = false;
		138
146	if (pl->ns->newmapcmd == 1)	139	if (pl->ns->newmapcmd == 1)
147	pl->ns->send_packet ("newmap");	140	pl->ns->send_packet ("newmap");
148		141
149	pl->ns->floorbox_reset ();	142	pl->ns->floorbox_reset ();
150	}	143	}
151		144
152	/** check for map change and send new map data */	145	/** check for map/region change and send new map data */
153	static void	146	static void
154	check_map_change (player *pl)	147	check_map_change (player *pl)
155	{	148	{
156	client &socket = *pl->ns;	149	client &socket = *pl->ns;
157	object *ob = pl->ob;	150	object *ob = pl->ob;
158	char buf[MAX_BUF]; /* eauugggh */	151	char buf[MAX_BUF]; /* eauugggh */
159		152
160	if (socket.current_map != ob->map)	153	if (socket.force_newmap && 0)
161	{	154	{
		155	// force newmap is used for clients that do not redraw their map
		156	// after image uploads.
162	socket.current_map = ob->map;	157	socket.current_map = ob->map;
163
164	clear_map (pl);	158	clear_map (pl);
		159	}
		160	else if (socket.current_map != ob->map)
		161	{
		162	clear_map (pl);
		163	socket.current_map = ob->map;
165		164
166	if (socket.mapinfocmd)	165	if (socket.mapinfocmd)
167	{	166	{
168	if (ob->map && ob->map->path[0])	167	if (ob->map && ob->map->path[0])
169	{	168	{
…		…
201	}	200	}
202	}	201	}
203		202
204	socket.current_x = ob->x;	203	socket.current_x = ob->x;
205	socket.current_y = ob->y;	204	socket.current_y = ob->y;
		205
		206	region *reg = ob->region ();
		207	if (socket.current_region != reg)
		208	{
		209	socket.current_region = reg;
		210	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		211	}
206	}	212	}
207		213
208	/**	214	/**
209	* RequestInfo is sort of a meta command. There is some specific	215	* RequestInfo is sort of a meta command. There is some specific
210	* request of information, but we call other functions to provide	216	* request of information, but we call other functions to provide
…		…
433	}	439	}
434	else if (!strcmp (cmd, "newmapcmd"))	440	else if (!strcmp (cmd, "newmapcmd"))
435	{	441	{
436	ns->newmapcmd = atoi (param);	442	ns->newmapcmd = atoi (param);
437	safe_strcat (cmdback, param, &slen, HUGE_BUF);	443	safe_strcat (cmdback, param, &slen, HUGE_BUF);
438	// } else if (!strcmp(cmd,"plugincmd")) {
439	// ns->plugincmd = atoi(param);
440	// safe_strcat(cmdback, param, &slen, HUGE_BUF);
441	}	444	}
442	else if (!strcmp (cmd, "mapinfocmd"))	445	else if (!strcmp (cmd, "mapinfocmd"))
443	{	446	{
444	ns->mapinfocmd = atoi (param);	447	ns->mapinfocmd = atoi (param);
445	safe_strcat (cmdback, "1", &slen, HUGE_BUF);	448	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
…		…
464	char tmpbuf[20];	467	char tmpbuf[20];
465	int q = atoi (param);	468	int q = atoi (param);
466		469
467	if (is_valid_faceset (q))	470	if (is_valid_faceset (q))
468	ns->faceset = q;	471	ns->faceset = q;
		472
469	sprintf (tmpbuf, "%d", ns->faceset);	473	sprintf (tmpbuf, "%d", ns->faceset);
470	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);	474	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
471	/* if the client is using faceset, it knows about image2 command */	475	/* if the client is using faceset, it knows about image2 command */
472	ns->image2 = 1;	476	ns->image2 = 1;
473	}	477	}
…		…
501	if (cp == 'x' \|\| cp == 'X')	505	if (cp == 'x' \|\| cp == 'X')
502	{	506	{
503	y = atoi (cp + 1);	507	y = atoi (cp + 1);
504	break;	508	break;
505	}	509	}
		510
506	if (x < 9 \|\| y < 9 \|\| x > MAP_CLIENT_X \|\| y > MAP_CLIENT_Y)	511	if (x < 9 \|\| y < 9 \|\| x > MAP_CLIENT_X \|\| y > MAP_CLIENT_Y)
507	{	512	{
508	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);	513	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
509	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);	514	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
510	}	515	}
…		…
565	* This is what takes care of it. We tell the client how things worked out.	570	* This is what takes care of it. We tell the client how things worked out.
566	* I am not sure if this file is the best place for this function. however,	571	* I am not sure if this file is the best place for this function. however,
567	* it either has to be here or init_sockets needs to be exported.	572	* it either has to be here or init_sockets needs to be exported.
568	*/	573	*/
569	void	574	void
570	AddMeCmd (char buf, int len, client ns)	575	AddMeCmd (char buf, int len, client ns)
571	{	576	{
		577	// face caching is mandatory
		578	if (!ns->facecache)
		579	{
		580	ns->send_drawinfo (
		581	"\n"
		582	"\n"
		583	"***\n"
		584	"*** WARNING:\n"
		585	"*** Your client does not support face/image caching,\n"
		586	"*** or it has been disabled. Face caching is mandatory\n"
		587	"*** so please enable it or use a newer client.\n"
		588	"***\n"
		589	"*** Look at your client preferences:\n"
		590	"***\n"
		591	"*** CFPlus: all known versions automatically enable the facecache.\n"
		592	"*** cfclient: use the -cache commandline option.\n"
		593	"*** cfclient: map will not redraw automatically (bug).\n"
		594	"*** gcfclient: use -cache commandline option, or enable\n"
		595	"*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
		596	"*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
		597	"***\n"
		598	"***\n",
		599	NDI_RED
		600	);
		601
		602	if (strstr (ns->version, "jcrossclient"))
		603	/* let them, for now*/;
		604	else
		605	{
		606	ns->flush ();
		607	//ns->destroy ();
		608	}
		609	//ns->facecache = true;
		610	}
		611
572	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	612	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
573	}	613	}
574		614
575	/** Reply to ExtendedInfos command */	615	/** Reply to ExtendedInfos command */
576	void	616	void
…		…
687		727
688	ns->send_packet (cmdback);	728	ns->send_packet (cmdback);
689	}	729	}
690		730
691	/**	731	/**
692	* A lot like the old AskSmooth (in fact, now called by AskSmooth).	732	* client requested an image. send it rate-limited
693	* Basically, it makes no sense to wait for the client to request a	733	* before flushing.
694	* a piece of data from us that we know the client wants. So
695	* if we know the client wants it, might as well push it to the
696	* client.
697	*/
698	static void
699	SendSmooth (client *ns, uint16 face)
700	{
701	uint16 smoothface;
702
703	/* If we can't find a face, return and set it so we won't try to send this
704	* again.
705	*/	734	*/
706	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	735	void
707	{	736	AskFaceCmd (char buf, int len, client ns)
708		737	{
709	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);	738	ns->askface.push_back (atoi (buf));
710	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
711	return;
712	}
713
714	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
715	esrv_send_face (ns, smoothface, 0);
716
717	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
718
719	packet sl ("smooth");
720
721	sl << uint16 (face)
722	<< uint16 (smoothface);
723
724	ns->send_packet (sl);
725	}	739	}
726		740
727	/**	741	/**
728	* Tells client the picture it has to use	742	* Tells client the picture it has to use
729	* to smooth a picture number given as argument.	743	* to smooth a picture number given as argument.
730	*/	744	*/
731	void	745	void
732	AskSmooth (char buf, int len, client ns)	746	AskSmooth (char buf, int len, client ns)
733	{	747	{
734	SendSmooth (ns, atoi (buf));	748	ns->send_face (atoi (buf));
735	}	749	}
736		750
737	/**	751	/**
738	* This handles the general commands from the client (ie, north, fire, cast,	752	* This handles the general commands from the client (ie, north, fire, cast,
739	* etc.)	753	* etc.)
…		…
798	* commands.	812	* commands.
799	*/	813	*/
800	pl->count = 0;	814	pl->count = 0;
801		815
802	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	816	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
803	int time = FABS (pl->ob->speed) < 0.001	817	int time = fabs (pl->ob->speed) < 0.001
804	? time = MAX_TIME * 100	818	? time = MAX_TIME * 100
805	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	819	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
806		820
807	/* Send confirmation of command execution now */	821	/* Send confirmation of command execution now */
808	packet sl ("comc");	822	packet sl ("comc");
809	sl << uint16 (cmdid) << uint32 (time);	823	sl << uint16 (cmdid) << uint32 (time);
810	pl->ns->send_packet (sl);	824	pl->ns->send_packet (sl);
…		…
846		860
847	case ST_CHANGE_CLASS:	861	case ST_CHANGE_CLASS:
848	key_change_class (pl->ob, buf[0]);	862	key_change_class (pl->ob, buf[0]);
849	break;	863	break;
850		864
851	case ST_CONFIRM_QUIT:
852	key_confirm_quit (pl->ob, buf[0]);
853	break;
854
855	case ST_GET_PARTY_PASSWORD: /* Get password for party */	865	case ST_GET_PARTY_PASSWORD: /* Get password for party */
856	receive_party_password (pl->ob, 13);	866	receive_party_password (pl->ob, 13);
857	break;	867	break;
858		868
859	default:	869	default:
…		…
879		889
880	ns->cs_version = atoi (buf);	890	ns->cs_version = atoi (buf);
881	ns->sc_version = ns->cs_version;	891	ns->sc_version = ns->cs_version;
882		892
883	LOG (llevDebug, "connection from client <%s>\n", buf);	893	LOG (llevDebug, "connection from client <%s>\n", buf);
884
885		894
886	//TODO: should log here just for statistics	895	//TODO: should log here just for statistics
887		896
888	//if (VERSION_CS != ns->cs_version)	897	//if (VERSION_CS != ns->cs_version)
889	// unchecked;	898	// unchecked;
…		…
1011	esrv_update_stats (player *pl)	1020	esrv_update_stats (player *pl)
1012	{	1021	{
1013	char buf[MAX_BUF];	1022	char buf[MAX_BUF];
1014	uint16 flags;	1023	uint16 flags;
1015		1024
		1025	client *ns = pl->ns;
1016	if (!pl->ns)	1026	if (!ns)
1017	return;	1027	return;
1018		1028
		1029	object *ob = pl->ob;
		1030	if (!ob)
		1031	return;
		1032
1019	packet sl ("stats");	1033	packet sl ("stats");
1020		1034
1021	if (pl->ob)
1022	{
1023	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1035	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1024	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1036	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1025	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1037	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1026	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1038	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1027	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1039	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1028	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1040	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1029	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1041	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1030	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1042	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1031	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1043	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1032	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);	1044	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1033	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);	1045	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1034	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);	1046	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1035	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1047	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1036	}
1037		1048
1038	for (int s = 0; s < NUM_SKILLS; s++)	1049	for (int s = 0; s < NUM_SKILLS; s++)
1039	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1050	if (object *skill = pl->last_skill_ob[s])
		1051	if (skill->stats.exp != ns->last_skill_exp [s])
1040	{	1052	{
		1053	ns->last_skill_exp [s] = skill->stats.exp;
		1054
1041	/* Always send along the level if exp changes. This is only	1055	/* Always send along the level if exp changes. This is only
1042	* 1 extra byte, but keeps processing simpler.	1056	* 1 extra byte, but keeps processing simpler.
1043	*/	1057	*/
1044	sl << uint8 (s + CS_STAT_SKILLINFO)	1058	sl << uint8 (s + CS_STAT_SKILLINFO)
1045	<< uint8 (pl->last_skill_ob[s]->level)	1059	<< uint8 (skill->level)
1046	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1060	<< uint64 (skill->stats.exp);
1047
1048	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1049	}	1061	}
1050		1062
1051	AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);	1063	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1052	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1064	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1053	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1065	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1054	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1066	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1055	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1067	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1056	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1068	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1057	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1069	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1058	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	1070	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1059	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	1071	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		1072
1060	flags = 0;	1073	flags = 0;
1061		1074
1062	if (pl->fire_on)	1075	if (pl->fire_on)
1063	flags \|= SF_FIREON;	1076	flags \|= SF_FIREON;
1064		1077
1065	if (pl->run_on)	1078	if (pl->run_on)
1066	flags \|= SF_RUNON;	1079	flags \|= SF_RUNON;
1067		1080
1068	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1081	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1069		1082
1070	if (pl->ns->sc_version < 1025)	1083	if (ns->sc_version < 1025)
1071	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1084	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1072	else	1085	else
1073	for (int i = 0; i < NROFATTACKS; i++)	1086	for (int i = 0; i < NROFATTACKS; i++)
1074	{	1087	{
1075	/* Skip ones we won't send */	1088	/* Skip ones we won't send */
1076	if (atnr_cs_stat[i] == -1)	1089	if (atnr_cs_stat[i] == -1)
1077	continue;	1090	continue;
1078		1091
1079	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1092	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1080	}	1093	}
1081		1094
1082	if (pl->ns->monitor_spells)	1095	if (pl->ns->monitor_spells)
1083	{	1096	{
1084	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1097	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1085	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1098	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1086	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1099	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1087	}	1100	}
1088		1101
1089	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1102	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1090	AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);	1103	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1091	set_title (pl->ob, buf);	1104	set_title (ob, buf);
1092	AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);	1105	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1093		1106
1094	/* Only send it away if we have some actual data */	1107	/* Only send it away if we have some actual data */
1095	if (sl.length () > 6)	1108	if (sl.length () > 6)
1096	pl->ns->send_packet (sl);	1109	ns->send_packet (sl);
1097	}	1110	}
1098		1111
1099	/**	1112	/**
1100	* Tells the client that here is a player it should start using.	1113	* Tells the client that here is a player it should start using.
1101	*/	1114	*/
1102	void	1115	void
1103	esrv_new_player (player *pl, uint32 weight)	1116	esrv_new_player (player *pl, uint32 weight)
1104	{	1117	{
1105	pl->last_weight = weight;
1106
1107	packet sl ("player");	1118	packet sl ("player");
1108		1119
1109	sl << uint32 (pl->ob->count)	1120	sl << uint32 (pl->ob->count)
1110	<< uint32 (weight)	1121	<< uint32 (weight)
1111	<< uint32 (pl->ob->face->number)	1122	<< uint32 (pl->ob->face)
1112	<< data8 (pl->ob->name);	1123	<< data8 (pl->ob->name);
1113		1124
		1125	pl->ns->last_weight = weight;
1114	pl->ns->send_packet (sl);	1126	pl->ns->send_packet (sl);
1115	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1127	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1116	}	1128	}
1117
1118	/**
1119	* Need to send an animation sequence to the client.
1120	* We will send appropriate face commands to the client if we haven't
1121	* sent them the face yet (this can become quite costly in terms of
1122	* how much we are sending - on the other hand, this should only happen
1123	* when the player logs in and picks stuff up.
1124	*/
1125	void
1126	esrv_send_animation (client * ns, short anim_num)
1127	{
1128	/* Do some checking on the anim_num we got. Note that the animations
1129	* are added in contigous order, so if the number is in the valid
1130	* range, it must be a valid animation.
1131	*/
1132	if (anim_num < 0 \|\| anim_num > num_animations)
1133	{
1134	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1135	return;
1136	}
1137
1138	packet sl ("anim");
1139
1140	sl << uint16 (anim_num)
1141	<< uint16 (0); /* flags - not used right now */
1142
1143	/* Build up the list of faces. Also, send any information (ie, the
1144	* the face itself) down to the client.
1145	*/
1146	for (int i = 0; i < animations[anim_num].num_animations; i++)
1147	{
1148	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1149	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1150
1151	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1152	}
1153
1154	ns->send_packet (sl);
1155
1156	ns->anims_sent[anim_num] = 1;
1157	}
1158
1159		1129
1160	/******************************************************************************	1130	/******************************************************************************
1161	*	1131	*
1162	* Start of map related commands.	1132	* Start of map related commands.
1163	*	1133	*
1164	******************************************************************************/	1134	******************************************************************************/
1165		1135
1166	/**
1167	* This adds face_num to a map cell at x,y. If the client doesn't have
1168	* the face yet, we will also send it.
1169	*/
1170	static void
1171	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1172	{
1173	if (newmap->cells[x][y].count >= MAP_LAYERS)
1174	{
1175	//TODO: one or the other, can't both have abort and return, verify and act
1176	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1177	return;
1178	abort ();
1179	}
1180
1181	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1182	newmap->cells[x][y].count++;
1183
1184	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1185	esrv_send_face (ns, face_num, 0);
1186	}
1187
1188	/** Clears a map cell */	1136	/** Clears a map cell */
1189	static void	1137	static void
1190	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	1138	map_clearcell (struct MapCell *cell, int count)
1191	{	1139	{
1192	cell->faces[0] = face0;	1140	cell->faces[0] = 0;
1193	cell->faces[1] = face1;	1141	cell->faces[1] = 0;
1194	cell->faces[2] = face2;	1142	cell->faces[2] = 0;
		1143	cell->smooth[0] = 0;
		1144	cell->smooth[1] = 0;
		1145	cell->smooth[2] = 0;
1195	cell->count = count;	1146	cell->count = count;
1196	cell->stat_hp = 0;	1147	cell->stat_hp = 0;
1197	cell->flags = 0;	1148	cell->flags = 0;
1198	cell->player = 0;	1149	cell->player = 0;
1199	}	1150	}
1200		1151
1201	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1202	#define MAX_LAYERS 3	1152	#define MAX_LAYERS 3
1203
1204	/* Using a global really isn't a good approach, but saves the over head of
1205	* allocating and deallocating such a block of data each time run through,
1206	* and saves the space of allocating this in the socket object when we only
1207	* need it for this cycle. If the server is ever threaded, this needs to be
1208	* re-examined.
1209	*/
1210	static object heads[MAX_HEAD_POS MAX_HEAD_POS * MAX_LAYERS];
1211
1212	/**
1213	* Returns true if any of the heads for this
1214	* space is set. Returns false if all are blank - this is used
1215	* for empty space checking.
1216	*/
1217	static inline int
1218	have_head (int ax, int ay)
1219	{
1220	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] \|\|
1221	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] \|\| heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1222	return 1;
1223
1224	return 0;
1225	}
1226
1227	/**
1228	* check_head is a bit simplistic version of update_space below.
1229	* basically, it only checks the that the head on space ax,ay at layer
1230	* needs to get sent - if so, it adds the data, sending the head
1231	* if needed, and returning 1. If this no data needs to get
1232	* sent, it returns zero.
1233	*/
1234	static int
1235	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1236	{
1237	short face_num;
1238
1239	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1240	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1241	else
1242	face_num = 0;
1243
1244	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1245	{
1246	sl << uint16 (face_num);
1247	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1248	esrv_send_face (&ns, face_num, 0);
1249
1250	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1251	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1252	return 1;
1253	}
1254
1255	return 0; /* No change */
1256	}
1257		1153
1258	/**	1154	/**
1259	* Removes the need to replicate the same code for each layer.	1155	* Removes the need to replicate the same code for each layer.
1260	* this returns true if this space is now in fact different than	1156	* this returns true if this space is now in fact different than
1261	* it was.	1157	* it was.
1262	* sl is the socklist this data is going into.	1158	* sl is the socklist this data is going into.
1263	* ns is the socket we are working on - all the info we care	1159	* ns is the socket we are working on - all the info we care
1264	* about is in this socket structure, so now need not pass the	1160	* about is in this socket structure, so now need not pass the
1265	* entire player object.	1161	* entire player object.
1266	* mx and my are map coordinate offsets for map mp
1267	* sx and sy are the offsets into the socket structure that
1268	* holds the old values.
1269	* layer is the layer to update, with 2 being the floor and 0 the	1162	* layer is the layer to update, with 2 being the floor and 0 the
1270	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	1163	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1271	* take. Interesting to note that before this function, the map1 function	1164	* take. Interesting to note that before this function, the map1 function
1272	* numbers the spaces differently - I think this was a leftover from	1165	* numbers the spaces differently - I think this was a leftover from
1273	* the map command, where the faces stack up. Sinces that is no longer	1166	* the map command, where the faces stack up. Sinces that is no longer
1274	* the case, it seems to make more sense to have these layer values	1167	* the case, it seems to make more sense to have these layer values
1275	* actually match.	1168	* actually match.
1276	*/	1169	*/
1277	static int	1170	static int
1278	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1171	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1279	{	1172	{
1280	object ob, head;	1173	object *ob = ms.faces_obj [layer];
1281	uint16 face_num;
1282	int bx, by, i;
1283
1284	/* If there is a multipart object stored away, treat that as more important.
1285	* If not, then do the normal processing.
1286	*/
1287	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1288
1289	/* Check to see if this head is part of the set of objects
1290	* we would normally send for this space. If so, then
1291	* don't use the head value. We need to do the check
1292	* here and not when setting up the heads[] value for two reasons -
1293	* 1) the heads[] values will get used even if the space is not visible.
1294	* 2) its possible the head is not on the same map as a part, and I'd
1295	* rather not need to do the map translation overhead.
1296	* 3) We need to do some extra checking to make sure that we will
1297	* otherwise send the image as this layer, eg, either it matches
1298	* the head value, or is not multipart.
1299	*/
1300	if (head && !head->more)
1301	{
1302	for (i = 0; i < MAP_LAYERS; i++)
1303	{
1304	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1305	if (!ob)
1306	continue;
1307
1308	if (ob->head)
1309	ob = ob->head;
1310
1311	if (ob == head)
1312	{
1313	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1314	head = NULL;
1315	break;
1316	}
1317	}
1318	}
1319
1320	ob = head;
1321	if (!ob)
1322	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1323		1174
1324	/* If there is no object for this space, or if the face for the object	1175	/* If there is no object for this space, or if the face for the object
1325	* is the blank face, set the face number to zero.	1176	* is the blank face, set the face number to zero.
1326	* else if we have the stored head object for this space, that takes	1177	* else if we have the stored head object for this space, that takes
1327	* precedence over the other object for this space.	1178	* precedence over the other object for this space.
1328	* otherwise, we do special head processing	1179	* otherwise, we do special head processing
1329	*/	1180	*/
1330	if (!ob \|\| ob->face == blank_face)	1181	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1331	face_num = 0;
1332	else if (head)
1333	{
1334	/* if this is a head that had previously been stored */
1335	face_num = ob->face->number;
1336	}
1337	else
1338	{
1339	/* if the faces for the different parts of a multipart object
1340	* are the same, we only want to send the bottom right most
1341	* portion of the object. That info is in the tail_.. values
1342	* of the head. Note that for the head itself, ob->head will
1343	* be null, so we only do this block if we are working on
1344	* a tail piece.
1345	*/
1346
1347	/* tail_x and tail_y will only be set in the head object. If
1348	* this is the head object and these are set, we proceed
1349	* with logic to only send bottom right. Similarly, if
1350	* this is one of the more parts but the head has those values
1351	* set, we want to do the processing. There can be cases where
1352	* the head is not visible but one of its parts is, so we just
1353	* can always expect that ob->arch->tail_x will be true for all
1354	* object we may want to display.
1355	*/
1356	if ((ob->arch->tail_x \|\| ob->arch->tail_y) \|\| (ob->head && (ob->head->arch->tail_x \|\| ob->head->arch->tail_y)))
1357	{
1358
1359	if (ob->head)
1360	head = ob->head;
1361	else
1362	head = ob;
1363
1364	/* Basically figure out where the offset is from where we are right
1365	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1366	* piece is from the head, and the tail is where the tail is from the
1367	* head. Note that bx and by will equal sx and sy if we are already working
1368	* on the bottom right corner. If ob is the head, the clone values
1369	* will be zero, so the right thing will still happen.
1370	*/
1371	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1372	by = sy + head->arch->tail_y - ob->arch->clone.y;
1373
1374	/* I don't think this can ever happen, but better to check for it just
1375	* in case.
1376	*/
1377	if (bx < sx \|\| by < sy)
1378	{
1379	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1380	face_num = 0;
1381	}
1382	/* single part object, multipart object with non merged faces,
1383	* of multipart object already at lower right.
1384	*/
1385	else if (bx == sx && by == sy)
1386	{
1387	face_num = ob->face->number;
1388
1389	/* if this face matches one stored away, clear that one away.
1390	* this code relies on the fact that the map1 commands
1391	* goes from 2 down to 0.
1392	*/
1393	for (i = 0; i < MAP_LAYERS; i++)
1394	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1395	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1396	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1397	}
1398	else
1399	{
1400	/* If this head is stored away, clear it - otherwise,
1401	* there can be cases where a object is on multiple layers -
1402	* we only want to send it once.
1403	*/
1404	face_num = head->face->number;
1405	for (i = 0; i < MAP_LAYERS; i++)
1406	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1407	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1408	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1409
1410	/* First, try to put the new head on the same layer. If that is used up,
1411	* then find another layer.
1412	*/
1413	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1414	{
1415	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1416	}
1417	else
1418	for (i = 0; i < MAX_LAYERS; i++)
1419	{
1420	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL \|\|
1421	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1422	{
1423	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1424	}
1425	}
1426	face_num = 0; /* Don't send this object - we'll send the head later */
1427	}
1428	}
1429	else
1430	{
1431	/* In this case, we are already at the lower right or single part object,
1432	* so nothing special
1433	*/
1434	face_num = ob->face->number;
1435
1436	/* clear out any head entries that have the same face as this one */
1437	for (bx = 0; bx < layer; bx++)
1438	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1439	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1440	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1441	}
1442	} /* else not already head object or blank face */
1443
1444	/* This is a real hack. Basically, if we have nothing to send for this layer,
1445	* but there is a head on the next layer, send that instead.
1446	* Without this, what happens is you can get the case where the player stands
1447	* on the same space as the head. However, if you have overlapping big objects
1448	* of the same type, what happens then is it doesn't think it needs to send
1449	* This tends to make stacking also work/look better.
1450	*/
1451	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1452	{
1453	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1454	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1455	}
1456
1457	/* Another hack - because of heads and whatnot, this face may match one
1458	* we already sent for a lower layer. In that case, don't send
1459	* this one.
1460	*/
1461	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1462	face_num = 0;
1463		1182
1464	/* We've gotten what face we want to use for the object. Now see if	1183	/* We've gotten what face we want to use for the object. Now see if
1465	* if it has changed since we last sent it to the client.	1184	* if it has changed since we last sent it to the client.
1466	*/	1185	*/
1467	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	1186	if (lastcell.faces[layer] != face_num)
1468	{	1187	{
1469	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	1188	lastcell.faces[layer] = face_num;
		1189
1470	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	1190	if (!ns.faces_sent[face_num])
		1191	if (ob)
		1192	ns.send_faces (ob);
		1193	else
1471	esrv_send_face (&ns, face_num, 0);	1194	ns.send_face (face_num);
1472		1195
1473	sl << uint16 (face_num);	1196	sl << uint16 (face_num);
1474	return 1;
1475	}
1476
1477	/* Nothing changed */
1478	return 0;
1479	}
1480
1481	/**
1482	* This function is mainly a copy of update_space,
1483	* except it handles update of the smoothing updates,
1484	* not the face updates.
1485	* Removes the need to replicate the same code for each layer.
1486	* this returns true if this smooth is now in fact different
1487	* than it was.
1488	* sl is the socklist this data is going into.
1489	* ns is the socket we are working on - all the info we care
1490	* about is in this socket structure, so know need to pass the
1491	* entire player object.
1492	* mx and my are map coordinate offsets for map mp
1493	* sx and sy are the offsets into the socket structure that
1494	* holds the old values.
1495	* layer is the layer to update, with 2 being the floor and 0 the
1496	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1497	* take.
1498	*/
1499
1500	static inline int
1501	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1502	{
1503	object *ob;
1504	int smoothlevel; /* old face_num; */
1505
1506	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1507
1508	/* If there is no object for this space, or if the face for the object
1509	* is the blank face, set the smoothlevel to zero.
1510	*/
1511	if (!ob \|\| ob->face == blank_face)
1512	smoothlevel = 0;
1513	else
1514	{
1515	smoothlevel = ob->smoothlevel;
1516	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1517	SendSmooth (&ns, ob->face->number);
1518	} /* else not already head object or blank face */
1519
1520	/* We've gotten what face we want to use for the object. Now see if
1521	* if it has changed since we last sent it to the client.
1522	*/
1523	if (smoothlevel > 255)
1524	smoothlevel = 255;
1525	else if (smoothlevel < 0)
1526	smoothlevel = 0;
1527
1528	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1529	{
1530	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1531	sl << uint8 (smoothlevel);
1532	return 1;	1197	return 1;
1533	}	1198	}
1534		1199
1535	/* Nothing changed */	1200	/* Nothing changed */
1536	return 0;	1201	return 0;
…		…
1551	if (ns->EMI_smooth)	1216	if (ns->EMI_smooth)
1552	result += 1; /One byte for smoothlevel /	1217	result += 1; /One byte for smoothlevel /
1553	}	1218	}
1554		1219
1555	return result;	1220	return result;
		1221	}
		1222
		1223	// prefetch (and touch) all maps within a specific distancd
		1224	static void
		1225	prefetch_surrounding_maps (maptile *map, int distance)
		1226	{
		1227	map->last_access = runtime;
		1228
		1229	if (--distance)
		1230	for (int dir = 4; --dir; )
		1231	if (const shstr &path = map->tile_path [dir])
		1232	if (maptile *&neigh = map->tile_map [dir])
		1233	prefetch_surrounding_maps (neigh, distance);
		1234	else
		1235	neigh = maptile::find_async (path, map);
		1236	}
		1237
		1238	// prefetch a generous area around the player
		1239	static void
		1240	prefetch_surrounding_maps (object *op)
		1241	{
		1242	prefetch_surrounding_maps (op->map, 3);
1556	}	1243	}
1557		1244
1558	/**	1245	/**
1559	* This function uses the new map1 protocol command to send the map	1246	* This function uses the new map1 protocol command to send the map
1560	* to the client. It is necessary because the old map command supports	1247	* to the client. It is necessary because the old map command supports
…		…
1578	* look like.	1265	* look like.
1579	*/	1266	*/
1580	void	1267	void
1581	draw_client_map1 (object *pl)	1268	draw_client_map1 (object *pl)
1582	{	1269	{
1583	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1270	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1584	sint16 nx, ny;	1271	sint16 nx, ny;
1585	int estartlen, eoldlen;	1272	int estartlen, eoldlen;
1586	uint16 mask, emask;
1587	uint8 eentrysize;	1273	uint8 eentrysize;
1588	uint16 ewhatstart, ewhatflag;	1274	uint16 ewhatstart, ewhatflag;
1589	uint8 extendedinfos;	1275	uint8 extendedinfos;
1590	maptile *m;	1276	maptile *m;
1591		1277
1592	client &socket = *pl->contr->ns;	1278	client &socket = *pl->contr->ns;
1593		1279
1594	if (!pl->active ())	1280	if (!pl->active)
1595	return;	1281	return;
1596		1282
1597	check_map_change (pl->contr);	1283	check_map_change (pl->contr);
		1284	prefetch_surrounding_maps (pl);
1598		1285
1599	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1286	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1600	packet esl;	1287	packet esl;
1601		1288
1602	startlen = sl.length ();	1289	startlen = sl.length ();
…		…
1617	<< uint8 (extendedinfos)	1304	<< uint8 (extendedinfos)
1618	<< uint8 (eentrysize);	1305	<< uint8 (eentrysize);
1619		1306
1620	estartlen = esl.length ();	1307	estartlen = esl.length ();
1621	}	1308	}
1622	else
1623	{
1624	/* suppress compiler warnings */
1625	ewhatstart = 0;
1626	ewhatflag = 0;
1627	estartlen = 0;
1628	}
1629
1630	/* Init data to zero */
1631	memset (heads, 0, sizeof (object ) MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1632		1309
1633	/* x,y are the real map locations. ax, ay are viewport relative	1310	/* x,y are the real map locations. ax, ay are viewport relative
1634	* locations.	1311	* locations.
1635	*/	1312	*/
1636	ay = 0;	1313	ay = 0;
…		…
1639	* but that started to get a bit messy to look at.	1316	* but that started to get a bit messy to look at.
1640	*/	1317	*/
1641	max_x = pl->x + (socket.mapx + 1) / 2;	1318	max_x = pl->x + (socket.mapx + 1) / 2;
1642	max_y = pl->y + (socket.mapy + 1) / 2;	1319	max_y = pl->y + (socket.mapy + 1) / 2;
1643		1320
1644	if (socket.mapmode == Map1aCmd)	1321	maptile *plmap = pl->map;
1645	{
1646	max_x += MAX_HEAD_OFFSET;
1647	max_y += MAX_HEAD_OFFSET;
1648	}
1649		1322
1650	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1323	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1651	{	1324	{
1652	ax = 0;	1325	ax = 0;
1653	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1326	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1654	{	1327	{
		1328	int emask, mask;
1655	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1329	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1656		1330
1657	/* If this space is out of the normal viewable area, we only check
1658	* the heads value ax or ay will only be greater than what
1659	* the client wants if using the map1a command - this is because
1660	* if the map1a command is not used, max_x and max_y will be
1661	* set to lower values.
1662	*/
1663	if (ax >= socket.mapx \|\| ay >= socket.mapy)
1664	{
1665	int i, got_one;
1666
1667	oldlen = sl.length ();
1668
1669	sl << uint16 (mask);
1670
1671	if (check_head (sl, socket, ax, ay, 2)) mask \|= 0x4;
1672	if (check_head (sl, socket, ax, ay, 1)) mask \|= 0x2;
1673	if (check_head (sl, socket, ax, ay, 0)) mask \|= 0x1;
1674
1675	/* If all we are doing is sending 0 (blank) faces, we don't
1676	* actually need to send that - just the coordinates
1677	* with no faces tells the client to blank out the
1678	* space.
1679	*/
1680	got_one = 0;
1681	for (i = oldlen + 2; i < sl.length (); i++)
1682	if (sl[i])
1683	got_one = 1;
1684
1685	if (got_one && (mask & 0xf))
1686	sl[oldlen + 1] = mask & 0xff;
1687	else
1688	{ /either all faces blank, either no face at all /
1689	if (mask & 0xf) /at least 1 face, we know it's blank, only send coordinates /
1690	sl.reset (oldlen + 2);
1691	else
1692	sl.reset (oldlen);
1693	}
1694
1695	/*What concerns extendinfos, nothing to be done for now
1696	* (perhaps effects layer later)
1697	*/
1698	continue; /* don't do processing below */
1699	}
1700
1701	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1331	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1702
1703	d = pl->contr->blocked_los[ax][ay];
1704		1332
1705	/* If the coordinates are not valid, or it is too dark to see,	1333	/* If the coordinates are not valid, or it is too dark to see,
1706	* we tell the client as such	1334	* we tell the client as such
1707	*/	1335	*/
1708	nx = x;	1336	nx = x;
1709	ny = y;	1337	ny = y;
1710	m = get_map_from_coord (pl->map, &nx, &ny);	1338	m = get_map_from_coord (plmap, &nx, &ny);
1711		1339
1712	if (!m)	1340	if (!m)
1713	{	1341	{
1714	/* space is out of map. Update space and clear values	1342	/* space is out of map. Update space and clear values
1715	* if this hasn't already been done. If the space is out	1343	* if this hasn't already been done. If the space is out
1716	* of the map, it shouldn't have a head	1344	* of the map, it shouldn't have a head
1717	*/	1345	*/
1718	if (lastcell.count != -1)	1346	if (lastcell.count != -1)
1719	{	1347	{
1720	sl << uint16 (mask);	1348	sl << uint16 (mask);
1721	map_clearcell (&lastcell, 0, 0, 0, -1);	1349	map_clearcell (&lastcell, -1);
1722	}	1350	}
		1351
		1352	continue;
1723	}	1353	}
		1354
		1355	m->touch ();
		1356
		1357	int d = pl->contr->blocked_los[ax][ay];
		1358
1724	else if (d > 3)	1359	if (d > 3)
1725	{	1360	{
1726	m->touch ();
1727		1361
1728	int need_send = 0, count;	1362	int need_send = 0, count;
1729		1363
1730	/* This block deals with spaces that are not visible for whatever	1364	/* This block deals with spaces that are not visible for whatever
1731	* reason. Still may need to send the head for this space.	1365	* reason. Still may need to send the head for this space.
1732	*/	1366	*/
1733		1367
1734	oldlen = sl.length ();	1368	oldlen = sl.length ();
1735		1369
1736	sl << uint16 (mask);	1370	sl << uint16 (mask);
…		…
1738	if (lastcell.count != -1)	1372	if (lastcell.count != -1)
1739	need_send = 1;	1373	need_send = 1;
1740		1374
1741	count = -1;	1375	count = -1;
1742		1376
1743	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1744	{
1745	/* Now check to see if any heads need to be sent */
1746
1747	if (check_head (sl, socket, ax, ay, 2)) mask \|= 0x4;
1748	if (check_head (sl, socket, ax, ay, 1)) mask \|= 0x2;
1749	if (check_head (sl, socket, ax, ay, 0)) mask \|= 0x1;
1750
1751	lastcell.count = count;
1752	}
1753	else
1754	{
1755	/* properly clear a previously sent big face */	1377	/* properly clear a previously sent big face */
1756	if (lastcell.faces[0] != 0 \|\| lastcell.faces[1] != 0 \|\| lastcell.faces[2] != 0	1378	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1757	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)	1379	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1758	need_send = 1;	1380	need_send = 1;
1759		1381
1760	map_clearcell (&lastcell, 0, 0, 0, count);	1382	map_clearcell (&lastcell, count);
1761	}
1762		1383
1763	if ((mask & 0xf) \|\| need_send)	1384	if ((mask & 0xf) \|\| need_send)
1764	sl[oldlen + 1] = mask & 0xff;	1385	sl[oldlen + 1] = mask & 0xff;
1765	else	1386	else
1766	sl.reset (oldlen);	1387	sl.reset (oldlen);
1767	}	1388	}
1768	else	1389	else
1769	{	1390	{
1770	m->touch ();
1771
1772	/* In this block, the space is visible or there are head objects	1391	/* In this block, the space is visible.
1773	* we need to send.
1774	*/	1392	*/
1775		1393
1776	/* Rather than try to figure out what everything that we might	1394	/* Rather than try to figure out what everything that we might
1777	* need to send is, then form the packet after that,	1395	* need to send is, then form the packet after that,
1778	* we presume that we will in fact form a packet, and update	1396	* we presume that we will in fact form a packet, and update
…		…
1781	* is done.	1399	* is done.
1782	* I think this is simpler than doing a bunch of checks to see	1400	* I think this is simpler than doing a bunch of checks to see
1783	* what if anything we need to send, setting the bits, then	1401	* what if anything we need to send, setting the bits, then
1784	* doing those checks again to add the real data.	1402	* doing those checks again to add the real data.
1785	*/	1403	*/
1786	oldlen = sl.length ();	1404	oldlen = sl.length ();
1787	mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1788	eoldlen = esl.length ();	1405	eoldlen = esl.length ();
1789	emask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1406
1790	sl << uint16 (mask);	1407	sl << uint16 (mask);
1791
1792	if (socket.ext_mapinfos)
1793	esl << uint16 (emask);
1794		1408
1795	unsigned char dummy;	1409	unsigned char dummy;
1796	unsigned char *last_ext = &dummy;	1410	unsigned char *last_ext = &dummy;
1797		1411
1798	/* Darkness changed */	1412	/* Darkness changed */
…		…
1810	sl << uint8 (255 - 64 * d);	1424	sl << uint8 (255 - 64 * d);
1811	}	1425	}
1812		1426
1813	lastcell.count = d;	1427	lastcell.count = d;
1814		1428
		1429	mapspace &ms = m->at (nx, ny);
		1430
1815	if (socket.extmap)	1431	if (socket.extmap)
1816	{	1432	{
1817	uint8 stat_hp = 0;	1433	uint8 stat_hp = 0;
1818	uint8 stat_width = 0;	1434	uint8 stat_width = 0;
1819	uint8 flags = 0;	1435	uint8 flags = 0;
1820	UUID player = 0;	1436	UUID player = 0;
1821		1437
1822	// send hp information, if applicable	1438	// send hp information, if applicable
1823	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1439	if (object *op = ms.faces_obj [0])
1824	{	1440	{
1825	if (op->head \|\| op->invisible)	1441	if (op->head \|\| op->invisible)
1826	; // do not show	1442	; // do not show
1827	else if (op->type == PLAYER	1443	else if (op->type == PLAYER
1828	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR))	1444	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR))
…		…
1882	sl << uint8 (8) << uint8 (flags);	1498	sl << uint8 (8) << uint8 (flags);
1883	}	1499	}
1884	}	1500	}
1885		1501
1886	/* Floor face */	1502	/* Floor face */
1887	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1503	if (update_space (sl, socket, ms, lastcell, 2))
1888	mask \|= 0x4;	1504	mask \|= 0x4;
1889		1505
1890	if (socket.EMI_smooth)
1891	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1892	emask \|= 0x4;
1893
1894	/* Middle face */	1506	/* Middle face */
1895	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1507	if (update_space (sl, socket, ms, lastcell, 1))
1896	mask \|= 0x2;	1508	mask \|= 0x2;
1897		1509
1898	if (socket.EMI_smooth)	1510	if (ms.player () == pl
1899	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1511	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1900	emask \|= 0x2;
1901
1902	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1903	{	1512	{
		1513	// force player to be visible to himself if invisible
1904	if (lastcell.faces[0] != pl->face->number)	1514	if (lastcell.faces[0] != pl->face)
1905	{	1515	{
1906	lastcell.faces[0] = pl->face->number;	1516	lastcell.faces[0] = pl->face;
		1517
1907	mask \|= 0x1;	1518	mask \|= 0x1;
1908
1909	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1910	esrv_send_face (&socket, pl->face->number, 0);
1911
1912	sl << uint16 (pl->face->number);	1519	sl << uint16 (pl->face);
		1520
		1521	socket.send_faces (pl);
1913	}	1522	}
1914	}	1523	}
1915	else
1916	{
1917	/* Top face */	1524	/* Top face */
1918	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1525	else if (update_space (sl, socket, ms, lastcell, 0))
1919	mask \|= 0x1;	1526	mask \|= 0x1;
1920
1921	if (socket.EMI_smooth)
1922	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1923	emask \|= 0x1;
1924	}	1527
1925		1528
1926	/* Check to see if we are in fact sending anything for this	1529	/* Check to see if we are in fact sending anything for this
1927	* space by checking the mask. If so, update the mask.	1530	* space by checking the mask. If so, update the mask.
1928	* if not, reset the len to that from before adding the mask	1531	* if not, reset the len to that from before adding the mask
1929	* value, so we don't send those bits.	1532	* value, so we don't send those bits.
…		…
1931	if (mask & 0xf)	1534	if (mask & 0xf)
1932	sl[oldlen + 1] = mask & 0xff;	1535	sl[oldlen + 1] = mask & 0xff;
1933	else	1536	else
1934	sl.reset (oldlen);	1537	sl.reset (oldlen);
1935		1538
		1539	if (socket.ext_mapinfos)
		1540	esl << uint16 (emask);
		1541
		1542	if (socket.EMI_smooth)
		1543	{
		1544	for (int layer = 2+1; layer--; )
		1545	{
		1546	object *ob = ms.faces_obj [layer];
		1547
		1548	// If there is no object for this space, or if the face for the object
		1549	// is the blank face, set the smoothlevel to zero.
		1550	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1551
		1552	// We've gotten what face we want to use for the object. Now see if
		1553	// if it has changed since we last sent it to the client.
		1554	if (lastcell.smooth[layer] != smoothlevel)
		1555	{
		1556	lastcell.smooth[layer] = smoothlevel;
		1557	esl << uint8 (smoothlevel);
		1558	emask \|= 1 << layer;
		1559	}
		1560	}
		1561
1936	if (emask & 0xf)	1562	if (emask & 0xf)
1937	esl[eoldlen + 1] = emask & 0xff;	1563	esl[eoldlen + 1] = emask & 0xff;
1938	else	1564	else
1939	esl.reset (eoldlen);	1565	esl.reset (eoldlen);
		1566	}
1940	} /* else this is a viewable space */	1567	} /* else this is a viewable space */
1941	} /* for x loop */	1568	} /* for x loop */
1942	} /* for y loop */	1569	} /* for y loop */
1943		1570
1944	/* Verify that we in fact do need to send this */	1571	/* Verify that we in fact do need to send this */
…		…
1947	if (!(sl.length () > startlen \|\| socket.sent_scroll))	1574	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1948	{	1575	{
1949	/* No map data will follow, so don't say the client	1576	/* No map data will follow, so don't say the client
1950	* it doesn't need draw!	1577	* it doesn't need draw!
1951	*/	1578	*/
1952	ewhatflag &= (~EMI_NOREDRAW);	1579	ewhatflag &= ~EMI_NOREDRAW;
1953	esl[ewhatstart + 1] = ewhatflag & 0xff;	1580	esl[ewhatstart + 1] = ewhatflag & 0xff;
1954	}	1581	}
1955		1582
1956	if (esl.length () > estartlen)	1583	if (esl.length () > estartlen)
1957	socket.send_packet (esl);	1584	socket.send_packet (esl);
…		…
1969	*/	1596	*/
1970	void	1597	void
1971	draw_client_map (object *pl)	1598	draw_client_map (object *pl)
1972	{	1599	{
1973	int i, j;	1600	int i, j;
1974	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1601	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1975	New_Face face, floor;
1976	New_Face *floor2;
1977	int d, mflags;	1602	int mflags;
1978	struct Map newmap;	1603	struct Map newmap;
1979	maptile m, pm;	1604	maptile m, pm;
1980		1605
1981	if (pl->type != PLAYER)	1606	if (pl->type != PLAYER)
1982	{	1607	{
…		…
2163		1788
2164	/* appends the spell spell to the Socklist we will send the data to. /	1789	/* appends the spell spell to the Socklist we will send the data to. /
2165	static void	1790	static void
2166	append_spell (player pl, packet &sl, object spell)	1791	append_spell (player pl, packet &sl, object spell)
2167	{	1792	{
2168	int len, i, skill = 0;	1793	int i, skill = 0;
2169		1794
2170	if (!(spell->name))	1795	if (!(spell->name))
2171	{	1796	{
2172	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1797	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2173	return;	1798	return;
…		…
2185	if (!strcmp (spell->skill, skill_names[i]))	1810	if (!strcmp (spell->skill, skill_names[i]))
2186	{	1811	{
2187	skill = i + CS_STAT_SKILLINFO;	1812	skill = i + CS_STAT_SKILLINFO;
2188	break;	1813	break;
2189	}	1814	}
		1815	}
		1816
		1817	// spells better have a face
		1818	if (!spell->face)
		1819	{
		1820	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1821	spell->face = face_find ("burnout.x11", blank_face);
2190	}	1822	}
2191		1823
2192	/* send the current values */	1824	/* send the current values */
2193	sl << uint32 (spell->count)	1825	sl << uint32 (spell->count)
2194	<< uint16 (spell->level)	1826	<< uint16 (spell->level)
…		…
2196	<< uint16 (spell->last_sp)	1828	<< uint16 (spell->last_sp)
2197	<< uint16 (spell->last_grace)	1829	<< uint16 (spell->last_grace)
2198	<< uint16 (spell->last_eat)	1830	<< uint16 (spell->last_eat)
2199	<< uint8 (skill)	1831	<< uint8 (skill)
2200	<< uint32 (spell->path_attuned)	1832	<< uint32 (spell->path_attuned)
2201	<< uint32 (spell->face ? spell->face->number : 0)	1833	<< uint32 (spell->face)
2202	<< data8 (spell->name)	1834	<< data8 (spell->name)
2203	<< data16 (spell->msg);	1835	<< data16 (spell->msg);
2204	}	1836	}
2205		1837
2206	/**	1838	/**
…		…
2221		1853
2222	packet sl ("addspell");	1854	packet sl ("addspell");
2223		1855
2224	if (!spell)	1856	if (!spell)
2225	{	1857	{
2226	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1858	for (spell = pl->ob->inv; spell; spell = spell->below)
2227	{	1859	{
2228	/* were we to simply keep appending data here, we could exceed	1860	/* were we to simply keep appending data here, we could exceed
2229	* MAXSOCKBUF if the player has enough spells to add, we know that	1861	* MAXSOCKBUF if the player has enough spells to add, we know that
2230	* append_spells will always append 19 data bytes, plus 4 length	1862	* append_spells will always append 19 data bytes, plus 4 length
2231	* bytes and 3 strings (because that is the spec) so we need to	1863	* bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.59 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs. Revision 1.80 by root, Fri Mar 16 02:51:08 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.59 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.80 by root, Fri Mar 16 02:51:08 2007 UTC