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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.143 by root, Tue Dec 23 06:58:24 2008 UTC vs.
Revision 1.155 by root, Thu Nov 5 16:03:07 2009 UTC

…		…
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* 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 Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
		24
		25	//+GPL
23		26
24	/**	27	/**
25	* \file	28	* \file
26	* Client handling.	29	* Client handling.
27	*	30	*
…		…
141		144
142	static void	145	static void
143	send_map_info (player *pl)	146	send_map_info (player *pl)
144	{	147	{
145	client &socket = *pl->ns;	148	client &socket = *pl->ns;
146	object *ob = pl->observe;	149	object *ob = pl->viewpoint;
147		150
148	if (socket.mapinfocmd)	151	if (socket.mapinfocmd)
149	{	152	{
150	if (ob->map && ob->map->path[0])	153	if (ob->map && ob->map->path[0])
151	{	154	{
…		…
168	/** check for map/region change and send new map data */	171	/** check for map/region change and send new map data */
169	static void	172	static void
170	check_map_change (player *pl)	173	check_map_change (player *pl)
171	{	174	{
172	client &socket = *pl->ns;	175	client &socket = *pl->ns;
173	object *ob = pl->observe;	176	object *ob = pl->viewpoint;
174		177
175	region *reg = ob->region ();	178	region *reg = ob->region ();
176	if (socket.current_region != reg)	179	if (socket.current_region != reg)
177	{	180	{
178	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	181	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
…		…
208	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)	211	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)
209	{	212	{
210	int dx = ob->x - socket.current_x;	213	int dx = ob->x - socket.current_x;
211	int dy = ob->y - socket.current_y;	214	int dy = ob->y - socket.current_y;
212		215
213	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))
214	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
215	else
216	{
217	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	216	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218	socket.floorbox_reset ();	217	socket.floorbox_reset ();
219	}
220	}	218	}
221		219
222	socket.current_x = ob->x;	220	socket.current_x = ob->x;
223	socket.current_y = ob->y;	221	socket.current_y = ob->y;
224	}	222	}
…		…
241	{	239	{
242	*params++ = 0;	240	*params++ = 0;
243	break;	241	break;
244	}	242	}
245		243
246	if (!strcmp (buf, "image_info"))
247	send_image_info (ns, params);
248	else if (!strcmp (buf, "image_sums"))
249	send_image_sums (ns, params);
250	else if (!strcmp (buf, "skill_info"))	244	if (!strcmp (buf, "skill_info"))
251	send_skill_info (ns, params);	245	send_skill_info (ns, params);
252	else if (!strcmp (buf, "spell_paths"))	246	else if (!strcmp (buf, "spell_paths"))
253	send_spell_paths (ns, params);	247	send_spell_paths (ns, params);
254	else	248	else
255	{	249	{
…		…
271	ExtiCmd (char buf, int len, client ns)	265	ExtiCmd (char buf, int len, client ns)
272	{	266	{
273	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	267	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274	}	268	}
275		269
		270	//-GPL
		271
276	void	272	void
277	client::mapinfo_queue_clear ()	273	client::mapinfo_queue_clear ()
278	{	274	{
279	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	275	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280	free (*i);	276	free (*i);
…		…
287	{	283	{
288	char *token = buf;	284	char *token = buf;
289	buf += strlen (buf) + 9;	285	buf += strlen (buf) + 9;
290		286
291	// initial map and its origin	287	// initial map and its origin
292	maptile *map = pl->observe->map;	288	maptile *map = pl->viewpoint->map;
293	int mapx = pl->ns->mapx / 2 - pl->observe->x;	289	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
294	int mapy = pl->ns->mapy / 2 - pl->observe->y;	290	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
295	int max_distance = 8; // limit maximum path length to something generous	291	int max_distance = 8; // limit maximum path length to something generous
296		292
297	while (*buf && map && max_distance)	293	while (*buf && map && max_distance)
298	{	294	{
299	int dir = *buf++ - '1';	295	int dir = *buf++ - '1';
…		…
404	AddMeCmd (char buf, int len, client ns)	400	AddMeCmd (char buf, int len, client ns)
405	{	401	{
406	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	402	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
407	}	403	}
408		404
409	/** Reply to ExtendedInfos command */	405	//+GPL
410	void
411	ToggleExtendedInfos (char buf, int len, client ns)
412	{
413	char cmdback[MAX_BUF];
414	char command[50];
415	int info, nextinfo;
416
417	cmdback[0] = '\0';
418	nextinfo = 0;
419
420	while (1)
421	{
422	/* 1. Extract an info */
423	info = nextinfo;
424
425	while ((info < len) && (buf[info] == ' '))
426	info++;
427
428	if (info >= len)
429	break;
430
431	nextinfo = info + 1;
432
433	while ((nextinfo < len) && (buf[nextinfo] != ' '))
434	nextinfo++;
435
436	if (nextinfo - info >= 49) /Erroneous info asked /
437	continue;
438
439	strncpy (command, &(buf[info]), nextinfo - info);
440
441	/* 2. Interpret info */
442	if (!strcmp ("smooth", command))
443	/* Toggle smoothing */
444	ns->EMI_smooth = !ns->EMI_smooth;
445	else
446	/bad value /;
447
448	/3. Next info /
449	}
450
451	strcpy (cmdback, "ExtendedInfoSet");
452
453	if (ns->EMI_smooth)
454	{
455	strcat (cmdback, " ");
456	strcat (cmdback, "smoothing");
457	}
458
459	ns->send_packet (cmdback);
460	}
461		406
462	/*	407	/*
463	#define MSG_TYPE_BOOK 1	408	#define MSG_TYPE_BOOK 1
464	#define MSG_TYPE_CARD 2	409	#define MSG_TYPE_CARD 2
465	#define MSG_TYPE_PAPER 3	410	#define MSG_TYPE_PAPER 3
…		…
482	while (1)	427	while (1)
483	{	428	{
484	/* 1. Extract an info */	429	/* 1. Extract an info */
485	info = nextinfo;	430	info = nextinfo;
486		431
487	while ((info < len) && (buf[info] == ' '))	432	while ((info < len) && (buf [info] == ' '))
488	info++;	433	info++;
489		434
490	if (info >= len)	435	if (info >= len)
491	break;	436	break;
492		437
493	nextinfo = info + 1;	438	nextinfo = info + 1;
494		439
495	while ((nextinfo < len) && (buf[nextinfo] != ' '))	440	while ((nextinfo < len) && (buf [nextinfo] != ' '))
496	nextinfo++;	441	nextinfo++;
497		442
498	if (nextinfo - info >= 49) /Erroneous info asked /	443	if (nextinfo - info >= 49) /Erroneous info asked /
499	continue;	444	continue;
500		445
501	strncpy (command, &(buf[info]), nextinfo - info);	446	memcpy (command, buf + info, nextinfo - info);
502	command[nextinfo - info] = '\0';	447	command [nextinfo - info] = 0;
		448
503	/* 2. Interpret info */	449	/* 2. Interpret info */
504	i = sscanf (command, "%d", &flag);	450	i = sscanf (command, "%d", &flag);
505		451
506	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	452	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
507	ns->supported_readables \|= (1 << flag);	453	ns->supported_readables \|= (1 << flag);
…		…
541	return;	487	return;
542		488
543	buf++;	489	buf++;
544	}	490	}
545		491
546	execute_newserver_command (pl->ob, (char *) buf);	492	execute_newserver_command (pl->ob, (char *)buf);
547		493
548	/* Perhaps something better should be done with a left over count.	494	/* Perhaps something better should be done with a left over count.
549	* Cleaning up the input should probably be done first - all actions	495	* Cleaning up the input should probably be done first - all actions
550	* for the command that issued the count should be done before any other	496	* for the command that issued the count should be done before any other
551	* commands.	497	* commands.
…		…
743	* Get player's current range attack in obuf.	689	* Get player's current range attack in obuf.
744	*/	690	*/
745	static void	691	static void
746	rangetostring (player pl, char obuf)	692	rangetostring (player pl, char obuf)
747	{	693	{
748	dynbuf_text buf;	694	dynbuf_text &buf = msg_dynbuf; buf.clear ();
749		695
750	if (pl->ranged_ob)	696	if (pl->ranged_ob)
751	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	697	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
752		698
753	if (pl->combat_ob)	699	if (pl->combat_ob)
…		…
984		930
985	/* Nothing changed */	931	/* Nothing changed */
986	return 0;	932	return 0;
987	}	933	}
988		934
989	/**	935	//-GPL
990	* Returns the size of a data for a map square as returned by
991	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
992	* available.
993	*/
994	int
995	getExtendedMapInfoSize (client * ns)
996	{
997	int result = 0;
998
999	if (ns->ext_mapinfos)
1000	{
1001	if (ns->EMI_smooth)
1002	result += 1; /One byte for smoothlevel /
1003	}
1004
1005	return result;
1006	}
1007		936
1008	// prefetch (and touch) all maps within a specific distancd	937	// prefetch (and touch) all maps within a specific distancd
1009	static void	938	static void
1010	prefetch_surrounding_maps (maptile *map, int distance)	939	prefetch_surrounding_maps (maptile *map, int distance)
1011	{	940	{
1012	map->last_access = runtime;	941	map->touch ();
1013		942
1014	if (--distance)	943	if (--distance)
1015	for (int dir = 4; --dir; )	944	for (int dir = 4; --dir; )
1016	if (const shstr &path = map->tile_path [dir])	945	if (const shstr &path = map->tile_path [dir])
1017	if (maptile *&neigh = map->tile_map [dir])	946	if (maptile *&neigh = map->tile_map [dir])
…		…
1025	prefetch_surrounding_maps (object *op)	954	prefetch_surrounding_maps (object *op)
1026	{	955	{
1027	prefetch_surrounding_maps (op->map, 3);	956	prefetch_surrounding_maps (op->map, 3);
1028	}	957	}
1029		958
		959	//+GPL
		960
1030	/**	961	/**
1031	* Draws client map.	962	* Draws client map.
1032	*/	963	*/
1033	void	964	void
1034	draw_client_map (player *pl)	965	draw_client_map (player *pl)
1035	{	966	{
1036	object *ob = pl->observe;	967	object *ob = pl->viewpoint;
1037	if (!ob->active)	968	if (!pl->observe->active)
1038	return;	969	return;
1039		970
1040	/* If player is just joining the game, he isn't here yet, so the map	971	/* If player is just joining the game, he isn't here yet, so the map
1041	* can get swapped out. If so, don't try to send them a map. All will	972	* can get swapped out. If so, don't try to send them a map. All will
1042	* be OK once they really log in.	973	* be OK once they really log in.
1043	*/	974	*/
1044	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	975	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1045	return;	976	return;
1046		977
1047	int startlen, oldlen;	978	int startlen, oldlen;
1048	int estartlen, eoldlen;
1049	uint8 eentrysize;
1050	uint16 ewhatstart, ewhatflag;
1051	uint8 extendedinfos;
1052		979
1053	check_map_change (pl);	980	check_map_change (pl);
1054	prefetch_surrounding_maps (pl->ob);	981	prefetch_surrounding_maps (pl->ob);
1055		982
1056	/* do LOS after calls to update_position */	983	/* do LOS after calls to update_position */
1057	/* unfortunately, we need to udpate los when observing, currently */	984	/* unfortunately, we need to udpate los when observing, currently */
1058	if (pl->do_los \|\| pl->observe != pl->ob)	985	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1059	{	986	{
1060	pl->do_los = 0;	987	pl->do_los = 0;
1061	pl->update_los ();	988	pl->update_los ();
1062	}	989	}
1063		990
…		…
1085	*/	1012	*/
1086		1013
1087	client &socket = *pl->ns;	1014	client &socket = *pl->ns;
1088		1015
1089	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1016	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1090	packet esl;
1091		1017
1092	startlen = sl.length ();	1018	startlen = sl.length ();
1093		1019
1094	/Extendedmapinfo structure initialisation /
1095	if (socket.ext_mapinfos)
1096	{
1097	extendedinfos = EMI_NOREDRAW;
1098
1099	if (socket.EMI_smooth)
1100	extendedinfos \|= EMI_SMOOTH;
1101
1102	ewhatstart = esl.length ();
1103	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1104	could need to be taken away */
1105	eentrysize = getExtendedMapInfoSize (&socket);
1106	esl << "mapextended "
1107	<< uint8 (extendedinfos)
1108	<< uint8 (eentrysize);
1109
1110	estartlen = esl.length ();
1111	}
1112
1113	/* We could do this logic as conditionals in the if statement,
1114	* but that started to get a bit messy to look at.
1115	*/
1116	int hx = socket.mapx / 2;	1020	int hx = socket.mapx / 2;
1117	int hy = socket.mapy / 2;	1021	int hy = socket.mapy / 2;
1118		1022
1119	for (int dx = -hx; dx <= hx; dx++)	1023	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
		1024	int ax = dx + hx;
		1025	int ay = dy + hy;
		1026
		1027	int mask = (ax << 10) \| (ay << 4);
		1028	MapCell &lastcell = socket.lastmap.cells[ax][ay];
		1029
		1030	/* If the coordinates are not valid, or it is too dark to see,
		1031	* we tell the client as such
		1032	*/
		1033	if (!m)
1120	{	1034	{
1121	sint16 nx, ny;	1035	/* space is out of map. Update space and clear values
1122	maptile *m = 0;	1036	* if this hasn't already been done. If the space is out
1123		1037	* of the map, it shouldn't have a head.
1124	for (int dy = -hy; dy <= hy; dy++)	1038	*/
		1039	if (lastcell.count != -1)
1125	{	1040	{
1126	// check to see if we can simply go one down quickly	1041	sl << uint16 (mask);
1127	if (m && ++ny >= m->height)	1042	map_clearcell (&lastcell, -1);
		1043	}
		1044
		1045	continue;
		1046	}
		1047
		1048	int d = pl->blocked_los_uc (dx, dy);
		1049
		1050	if (d > 3)
		1051	{
		1052	/* This block deals with spaces that are not visible for whatever
		1053	* reason. Still may need to send the head for this space.
		1054	*/
		1055	if (lastcell.count != -1
		1056	\|\| lastcell.faces[0]
		1057	\|\| lastcell.faces[1]
		1058	\|\| lastcell.faces[2]
		1059	\|\| lastcell.stat_hp
		1060	\|\| lastcell.flags
		1061	\|\| lastcell.player)
		1062	sl << uint16 (mask);
		1063
		1064	/* properly clear a previously sent big face */
		1065	map_clearcell (&lastcell, -1);
		1066	}
		1067	else
		1068	{
		1069	/* In this block, the space is visible.
		1070	*/
		1071
		1072	/* Rather than try to figure out what everything that we might
		1073	* need to send is, then form the packet after that,
		1074	* we presume that we will in fact form a packet, and update
		1075	* the bits by what we do actually send. If we send nothing,
		1076	* we just back out sl.length () to the old value, and no harm
		1077	* is done.
		1078	* I think this is simpler than doing a bunch of checks to see
		1079	* what if anything we need to send, setting the bits, then
		1080	* doing those checks again to add the real data.
		1081	*/
		1082	oldlen = sl.length ();
		1083
		1084	sl << uint16 (mask);
		1085
		1086	unsigned char dummy;
		1087	unsigned char *last_ext = &dummy;
		1088
		1089	/* Darkness changed */
		1090	if (lastcell.count != d)
		1091	{
1128	m = 0;	1092	mask \|= 0x8;
1129		1093
1130	// no, so do it the slow way	1094	*last_ext \|= 0x80;
1131	if (!m)	1095	last_ext = &sl[sl.length ()];
		1096	sl << uint8 (d);
		1097	}
		1098
		1099	lastcell.count = d;
		1100
		1101	mapspace &ms = m->at (nx, ny);
		1102	ms.update ();
		1103
		1104	// extmap handling
		1105	uint8 stat_hp = 0;
		1106	uint8 stat_width = 0;
		1107	uint8 flags = 0;
		1108	tag_t player = 0;
		1109
		1110	// send hp information, if applicable
		1111	if (object *op = ms.faces_obj [0])
		1112	if (op->is_head () && !op->invisible)
1132	{	1113	{
1133	nx = ob->x + dx; ny = ob->y + dy; m = ob->map;	1114	if (op->stats.maxhp > op->stats.hp
1134		1115	&& op->stats.maxhp > 0
1135	if (xy_normalise (m, nx, ny))	1116	&& (op->type == PLAYER
1136	m->touch ();	1117	\|\| op->type == DOOR // does not work, have maxhp 0
1137	else	1118	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1119	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1120	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1138	m = 0;	1121	{
		1122	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1123	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1124	}
		1125
		1126	if (expect_false (op->has_dialogue ()))
		1127	flags \|= 1;
		1128
		1129	if (expect_false (op->type == PLAYER))
		1130	player = op == ob ? pl->ob->count
		1131	: op == pl->ob ? ob->count
		1132	: op->count;
1139	}	1133	}
1140		1134
1141	int ax = dx + hx;	1135	if (expect_false (lastcell.stat_hp != stat_hp))
1142	int ay = dy + hy;
1143
1144	int emask, mask;
1145	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1146
1147	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1148
1149	/* If the coordinates are not valid, or it is too dark to see,
1150	* we tell the client as such
1151	*/
1152	if (!m)
1153	{	1136	{
1154	/* space is out of map. Update space and clear values	1137	lastcell.stat_hp = stat_hp;
1155	* if this hasn't already been done. If the space is out	1138
1156	* of the map, it shouldn't have a head.	1139	mask \|= 0x8;
1157	*/	1140	*last_ext \|= 0x80;
1158	if (lastcell.count != -1)	1141	last_ext = &sl[sl.length ()];
		1142
		1143	sl << uint8 (5) << uint8 (stat_hp);
		1144
		1145	if (stat_width > 1)
1159	{	1146	{
1160	sl << uint16 (mask);
1161	map_clearcell (&lastcell, -1);
1162	}
1163
1164	continue;
1165	}
1166
1167	int d = pl->blocked_los_uc (dx, dy);
1168
1169	if (d > 3)
1170	{
1171	int need_send = 0, count;
1172
1173	/* This block deals with spaces that are not visible for whatever
1174	* reason. Still may need to send the head for this space.
1175	*/
1176
1177	oldlen = sl.length ();
1178
1179	sl << uint16 (mask);
1180
1181	if (lastcell.count != -1)
1182	need_send = 1;
1183
1184	count = -1;
1185
1186	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1187	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1188	need_send = 1;
1189
1190	/* properly clear a previously sent big face */
1191	map_clearcell (&lastcell, count);
1192
1193	if ((mask & 0xf) \|\| need_send)
1194	sl[oldlen + 1] = mask & 0xff;
1195	else
1196	sl.reset (oldlen);
1197	}
1198	else
1199	{
1200	/* In this block, the space is visible.
1201	*/
1202
1203	/* Rather than try to figure out what everything that we might
1204	* need to send is, then form the packet after that,
1205	* we presume that we will in fact form a packet, and update
1206	* the bits by what we do actually send. If we send nothing,
1207	* we just back out sl.length () to the old value, and no harm
1208	* is done.
1209	* I think this is simpler than doing a bunch of checks to see
1210	* what if anything we need to send, setting the bits, then
1211	* doing those checks again to add the real data.
1212	*/
1213	oldlen = sl.length ();
1214	eoldlen = esl.length ();
1215
1216	sl << uint16 (mask);
1217
1218	unsigned char dummy;
1219	unsigned char *last_ext = &dummy;
1220
1221	/* Darkness changed */
1222	if (lastcell.count != d && socket.darkness)
1223	{
1224	mask \|= 0x8;
1225
1226	if (socket.extmap)
1227	{
1228	*last_ext \|= 0x80;	1147	*last_ext \|= 0x80;
1229	last_ext = &sl[sl.length ()];	1148	last_ext = &sl[sl.length ()];
1230	sl << uint8 (d);	1149
1231	}	1150	sl << uint8 (6) << uint8 (stat_width);
1232	else
1233	sl << uint8 (255 - 64 * d);
1234	}	1151	}
		1152	}
1235		1153
1236	lastcell.count = d;	1154	if (expect_false (lastcell.player != player))
1237
1238	mapspace &ms = m->at (nx, ny);
1239	ms.update ();
1240
1241	if (socket.extmap)
1242	{	1155	{
1243	uint8 stat_hp = 0;	1156	lastcell.player = player;
1244	uint8 stat_width = 0;
1245	uint8 flags = 0;
1246	tag_t player = 0;
1247		1157
1248	// send hp information, if applicable
1249	if (object *op = ms.faces_obj [0])
1250	if (op->is_head () && !op->invisible)
1251	{
1252	if (op->stats.maxhp > op->stats.hp
1253	&& op->stats.maxhp > 0
1254	&& (op->type == PLAYER
1255	\|\| op->type == DOOR // does not work, have maxhp 0
1256	\|\| QUERY_FLAG (op, FLAG_MONSTER)
1257	\|\| QUERY_FLAG (op, FLAG_ALIVE)
1258	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1259	{
1260	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1261	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1262	}
1263
1264	if (op->has_dialogue ())
1265	flags \|= 1;
1266
1267	if (op->type == PLAYER)
1268	player = op == ob ? pl->ob->count
1269	: op == pl->ob ? ob->count
1270	: op->count;
1271	}
1272
1273	if (lastcell.stat_hp != stat_hp)
1274	{
1275	lastcell.stat_hp = stat_hp;
1276
1277	mask \|= 0x8;	1158	mask \|= 0x8;
1278	*last_ext \|= 0x80;	1159	*last_ext \|= 0x80;
1279	last_ext = &sl[sl.length ()];	1160	last_ext = &sl[sl.length ()];
1280		1161
1281	sl << uint8 (5) << uint8 (stat_hp);
1282
1283	if (stat_width > 1)
1284	{
1285	*last_ext \|= 0x80;
1286	last_ext = &sl[sl.length ()];
1287
1288	sl << uint8 (6) << uint8 (stat_width);
1289	}
1290	}
1291
1292	if (lastcell.player != player)
1293	{
1294	lastcell.player = player;
1295
1296	mask \|= 0x8;
1297	*last_ext \|= 0x80;
1298	last_ext = &sl[sl.length ()];
1299
1300	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1162	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1301	}	1163	}
1302		1164
1303	if (lastcell.flags != flags)	1165	if (expect_false (lastcell.flags != flags))
1304	{	1166	{
1305	lastcell.flags = flags;	1167	lastcell.flags = flags;
1306		1168
1307	mask \|= 0x8;	1169	mask \|= 0x8;
1308	*last_ext \|= 0x80;	1170	*last_ext \|= 0x80;
1309	last_ext = &sl[sl.length ()];	1171	last_ext = &sl[sl.length ()];
1310		1172
1311	sl << uint8 (8) << uint8 (flags);	1173	sl << uint8 (8) << uint8 (flags);
1312	}
1313	}	1174	}
1314		1175
		1176	// faces
		1177
1315	/* Floor face */	1178	/* Floor face */
1316	if (update_space (sl, socket, ms, lastcell, 2))	1179	if (update_space (sl, socket, ms, lastcell, 2))
1317	mask \|= 0x4;	1180	mask \|= 0x4;
1318		1181
1319	/* Middle face */	1182	/* Middle face */
1320	if (update_space (sl, socket, ms, lastcell, 1))	1183	if (update_space (sl, socket, ms, lastcell, 1))
1321	mask \|= 0x2;	1184	mask \|= 0x2;
1322		1185
1323	if (ob->invisible	1186	if (expect_false (ob->invisible)
1324	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)	1187	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1325	&& ms.player () == ob)	1188	&& ms.player () == ob)
1326	{	1189	{
1327	// force player to be visible to himself if invisible	1190	// force player to be visible to himself if invisible
1328	if (lastcell.faces[0] != ob->face)	1191	if (lastcell.faces[0] != ob->face)
1329	{	1192	{
1330	lastcell.faces[0] = ob->face;	1193	lastcell.faces[0] = ob->face;
1331		1194
1332	mask \|= 0x1;
1333	sl << uint16 (ob->face);
1334
1335	socket.send_faces (ob);
1336	}
1337	}
1338	/* Top face */
1339	else if (update_space (sl, socket, ms, lastcell, 0))
1340	mask \|= 0x1;	1195	mask \|= 0x1;
		1196	sl << uint16 (ob->face);
1341		1197
		1198	socket.send_faces (ob);
		1199	}
		1200	}
		1201	/* Top face */
		1202	else if (update_space (sl, socket, ms, lastcell, 0))
		1203	mask \|= 0x1;
		1204
1342	/* Check to see if we are in fact sending anything for this	1205	/* Check to see if we are in fact sending anything for this
1343	* space by checking the mask. If so, update the mask.	1206	* space by checking the mask. If so, update the mask.
1344	* if not, reset the len to that from before adding the mask	1207	* if not, reset the len to that from before adding the mask
1345	* value, so we don't send those bits.	1208	* value, so we don't send those bits.
1346	*/	1209	*/
1347	if (mask & 0xf)	1210	if (mask & 0xf)
1348	sl[oldlen + 1] = mask & 0xff;	1211	sl[oldlen + 1] = mask & 0xff;
1349	else	1212	else
1350	sl.reset (oldlen);	1213	sl.reset (oldlen);
1351
1352	if (socket.ext_mapinfos)
1353	esl << uint16 (emask);
1354
1355	if (socket.EMI_smooth)
1356	{
1357	for (int layer = 2+1; layer--; )
1358	{
1359	object *ob = ms.faces_obj [layer];
1360
1361	// If there is no object for this space, or if the face for the object
1362	// is the blank face, set the smoothlevel to zero.
1363	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1364
1365	// We've gotten what face we want to use for the object. Now see if
1366	// if it has changed since we last sent it to the client.
1367	if (lastcell.smooth[layer] != smoothlevel)
1368	{
1369	lastcell.smooth[layer] = smoothlevel;
1370	esl << uint8 (smoothlevel);
1371	emask \|= 1 << layer;
1372	}
1373	}
1374
1375	if (emask & 0xf)
1376	esl[eoldlen + 1] = emask & 0xff;
1377	else
1378	esl.reset (eoldlen);
1379	}
1380	} /* else this is a viewable space */	1214	} /* else this is a viewable space */
1381	} /* for x loop */	1215	ordered_mapwalk_end
1382	} /* for y loop */
1383		1216
1384	socket.flush_fx ();	1217	socket.flush_fx ();
1385
1386	/* Verify that we in fact do need to send this */
1387	if (socket.ext_mapinfos)
1388	{
1389	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1390	{
1391	/* No map data will follow, so don't say the client
1392	* it doesn't need draw!
1393	*/
1394	ewhatflag &= ~EMI_NOREDRAW;
1395	esl[ewhatstart + 1] = ewhatflag & 0xff;
1396	}
1397
1398	if (esl.length () > estartlen)
1399	socket.send_packet (esl);
1400	}
1401		1218
1402	if (sl.length () > startlen \|\| socket.sent_scroll)	1219	if (sl.length () > startlen \|\| socket.sent_scroll)
1403	{	1220	{
1404	socket.send_packet (sl);	1221	socket.send_packet (sl);
1405	socket.sent_scroll = 0;	1222	socket.sent_scroll = 0;
…		…
1649	/* finally, we can send the packet */	1466	/* finally, we can send the packet */
1650	pl->ns->flush_fx ();	1467	pl->ns->flush_fx ();
1651	pl->ns->send_packet (sl);	1468	pl->ns->send_packet (sl);
1652	}	1469	}
1653		1470
		1471	//-GPL
		1472

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.143 by root, Tue Dec 23 06:58:24 2008 UTC vs. Revision 1.155 by root, Thu Nov 5 16:03:07 2009 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.143 by root, Tue Dec 23 06:58:24 2008 UTC vs.
Revision 1.155 by root, Thu Nov 5 16:03:07 2009 UTC