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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.142 by root, Sat Dec 20 02:32:31 2008 UTC vs.
Revision 1.150 by root, Mon Oct 12 14:00:59 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	*/
23		24
24	/**	25	/**
…		…
98	*/	99	*/
99	mx = ns->mapx;	100	mx = ns->mapx;
100	my = ns->mapy;	101	my = ns->mapy;
101		102
102	/* 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
103	* (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,
104	* if the destination x or y coordinate is outside the viewable	105	* if the destination x or y coordinate is outside the viewable
105	* area, we clear the values - otherwise, the old values	106	* area, we clear the values - otherwise, the old values
106	* 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.
107	*/	108	*/
108	for (x = 0; x < mx; x++)	109	for (x = 0; x < mx; x++)
109	{
110	for (y = 0; y < my; y++)	110	for (y = 0; y < my; y++)
111	{
112	if (x >= ns->mapx \|\| y >= ns->mapy)	111	if (x >= ns->mapx \|\| y >= ns->mapy)
113	/* clear cells outside the viewable area */	112	/* clear cells outside the viewable area */
114	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	113	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115	else if ((x + dx) < 0 \|\| (x + dx) >= ns->mapx \|\| (y + dy) < 0 \|\| (y + dy) >= ns->mapy)	114	else if ((x + dx) < 0 \|\| (x + dx) >= ns->mapx \|\| (y + dy) < 0 \|\| (y + dy) >= ns->mapy)
116	/* clear newly visible tiles within the viewable area */	115	/* clear newly visible tiles within the viewable area */
117	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	116	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118	else	117	else
119	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	118	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120	}
121	}
122		119
123	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	120	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124		121
125	/* Make sure that the next "map1" command will be sent (even if it is	122	/* Make sure that the next "map1" command will be sent (even if it is
126	* empty).	123	* empty).
…		…
212	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)	209	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)
213	{	210	{
214	int dx = ob->x - socket.current_x;	211	int dx = ob->x - socket.current_x;
215	int dy = ob->y - socket.current_y;	212	int dy = ob->y - socket.current_y;
216		213
217	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))
218	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
219	else
220	{
221	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	214	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
222	socket.floorbox_reset ();	215	socket.floorbox_reset ();
223	}
224	}	216	}
225		217
226	socket.current_x = ob->x;	218	socket.current_x = ob->x;
227	socket.current_y = ob->y;	219	socket.current_y = ob->y;
228	}	220	}
…		…
408	AddMeCmd (char buf, int len, client ns)	400	AddMeCmd (char buf, int len, client ns)
409	{	401	{
410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	402	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
411	}	403	}
412		404
413	/** Reply to ExtendedInfos command */
414	void
415	ToggleExtendedInfos (char buf, int len, client ns)
416	{
417	char cmdback[MAX_BUF];
418	char command[50];
419	int info, nextinfo;
420
421	cmdback[0] = '\0';
422	nextinfo = 0;
423
424	while (1)
425	{
426	/* 1. Extract an info */
427	info = nextinfo;
428
429	while ((info < len) && (buf[info] == ' '))
430	info++;
431
432	if (info >= len)
433	break;
434
435	nextinfo = info + 1;
436
437	while ((nextinfo < len) && (buf[nextinfo] != ' '))
438	nextinfo++;
439
440	if (nextinfo - info >= 49) /Erroneous info asked /
441	continue;
442
443	strncpy (command, &(buf[info]), nextinfo - info);
444
445	/* 2. Interpret info */
446	if (!strcmp ("smooth", command))
447	/* Toggle smoothing */
448	ns->EMI_smooth = !ns->EMI_smooth;
449	else
450	/bad value /;
451
452	/3. Next info /
453	}
454
455	strcpy (cmdback, "ExtendedInfoSet");
456
457	if (ns->EMI_smooth)
458	{
459	strcat (cmdback, " ");
460	strcat (cmdback, "smoothing");
461	}
462
463	ns->send_packet (cmdback);
464	}
465
466	/*	405	/*
467	#define MSG_TYPE_BOOK 1	406	#define MSG_TYPE_BOOK 1
468	#define MSG_TYPE_CARD 2	407	#define MSG_TYPE_CARD 2
469	#define MSG_TYPE_PAPER 3	408	#define MSG_TYPE_PAPER 3
470	#define MSG_TYPE_SIGN 4	409	#define MSG_TYPE_SIGN 4
…		…
747	* Get player's current range attack in obuf.	686	* Get player's current range attack in obuf.
748	*/	687	*/
749	static void	688	static void
750	rangetostring (player pl, char obuf)	689	rangetostring (player pl, char obuf)
751	{	690	{
752	dynbuf_text buf;	691	dynbuf_text &buf = msg_dynbuf; buf.clear ();
753		692
754	if (pl->ranged_ob)	693	if (pl->ranged_ob)
755	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	694	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
756		695
757	if (pl->combat_ob)	696	if (pl->combat_ob)
…		…
988		927
989	/* Nothing changed */	928	/* Nothing changed */
990	return 0;	929	return 0;
991	}	930	}
992		931
993	/**
994	* Returns the size of a data for a map square as returned by
995	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
996	* available.
997	*/
998	int
999	getExtendedMapInfoSize (client * ns)
1000	{
1001	int result = 0;
1002
1003	if (ns->ext_mapinfos)
1004	{
1005	if (ns->EMI_smooth)
1006	result += 1; /One byte for smoothlevel /
1007	}
1008
1009	return result;
1010	}
1011
1012	// prefetch (and touch) all maps within a specific distancd	932	// prefetch (and touch) all maps within a specific distancd
1013	static void	933	static void
1014	prefetch_surrounding_maps (maptile *map, int distance)	934	prefetch_surrounding_maps (maptile *map, int distance)
1015	{	935	{
1016	map->last_access = runtime;	936	map->touch ();
1017		937
1018	if (--distance)	938	if (--distance)
1019	for (int dir = 4; --dir; )	939	for (int dir = 4; --dir; )
1020	if (const shstr &path = map->tile_path [dir])	940	if (const shstr &path = map->tile_path [dir])
1021	if (maptile *&neigh = map->tile_map [dir])	941	if (maptile *&neigh = map->tile_map [dir])
…		…
1047	*/	967	*/
1048	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	968	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1049	return;	969	return;
1050		970
1051	int startlen, oldlen;	971	int startlen, oldlen;
1052	int estartlen, eoldlen;
1053	uint8 eentrysize;
1054	uint16 ewhatstart, ewhatflag;
1055	uint8 extendedinfos;
1056		972
1057	check_map_change (pl);	973	check_map_change (pl);
1058	prefetch_surrounding_maps (pl->ob);	974	prefetch_surrounding_maps (pl->ob);
1059		975
1060	/* do LOS after calls to update_position */	976	/* do LOS after calls to update_position */
1061	if (ob != pl->ob)	977	/* unfortunately, we need to udpate los when observing, currently */
1062	pl->clear_los (0);	978	if (pl->do_los \|\| pl->observe != pl->ob)
1063	else if (pl->do_los)
1064	{	979	{
1065	update_los (ob);
1066	pl->do_los = 0;	980	pl->do_los = 0;
		981	pl->update_los ();
1067	}	982	}
1068		983
1069	/**	984	/**
1070	* This function uses the new map1 protocol command to send the map	985	* This function uses the new map1 protocol command to send the map
1071	* to the client. It is necessary because the old map command supports	986	* to the client. It is necessary because the old map command supports
…		…
1090	*/	1005	*/
1091		1006
1092	client &socket = *pl->ns;	1007	client &socket = *pl->ns;
1093		1008
1094	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1009	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1095	packet esl;
1096		1010
1097	startlen = sl.length ();	1011	startlen = sl.length ();
1098		1012
1099	/Extendedmapinfo structure initialisation /
1100	if (socket.ext_mapinfos)
1101	{
1102	extendedinfos = EMI_NOREDRAW;
1103
1104	if (socket.EMI_smooth)
1105	extendedinfos \|= EMI_SMOOTH;
1106
1107	ewhatstart = esl.length ();
1108	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1109	could need to be taken away */
1110	eentrysize = getExtendedMapInfoSize (&socket);
1111	esl << "mapextended "
1112	<< uint8 (extendedinfos)
1113	<< uint8 (eentrysize);
1114
1115	estartlen = esl.length ();
1116	}
1117
1118	/* We could do this logic as conditionals in the if statement,
1119	* but that started to get a bit messy to look at.
1120	*/
1121	int hx = socket.mapx / 2;	1013	int hx = socket.mapx / 2;
1122	int hy = socket.mapy / 2;	1014	int hy = socket.mapy / 2;
1123		1015
1124	for (int dx = -hx; dx <= hx; dx++)	1016	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
		1017	int ax = dx + hx;
		1018	int ay = dy + hy;
		1019
		1020	int mask = (ax << 10) \| (ay << 4);
		1021	MapCell &lastcell = socket.lastmap.cells[ax][ay];
		1022
		1023	/* If the coordinates are not valid, or it is too dark to see,
		1024	* we tell the client as such
		1025	*/
		1026	if (!m)
1125	{	1027	{
1126	sint16 nx, ny;	1028	/* space is out of map. Update space and clear values
1127	maptile *m = 0;	1029	* if this hasn't already been done. If the space is out
1128		1030	* of the map, it shouldn't have a head.
1129	for (int dy = -hy; dy <= hy; dy++)	1031	*/
		1032	if (lastcell.count != -1)
1130	{	1033	{
1131	// check to see if we can simply go one down quickly	1034	sl << uint16 (mask);
1132	if (m && ++ny >= m->height)	1035	map_clearcell (&lastcell, -1);
		1036	}
		1037
		1038	continue;
		1039	}
		1040
		1041	int d = pl->blocked_los_uc (dx, dy);
		1042
		1043	if (d > 3)
		1044	{
		1045	/* This block deals with spaces that are not visible for whatever
		1046	* reason. Still may need to send the head for this space.
		1047	*/
		1048	if (lastcell.count != -1
		1049	\|\| lastcell.faces[0]
		1050	\|\| lastcell.faces[1]
		1051	\|\| lastcell.faces[2]
		1052	\|\| lastcell.stat_hp
		1053	\|\| lastcell.flags
		1054	\|\| lastcell.player)
		1055	sl << uint16 (mask);
		1056
		1057	/* properly clear a previously sent big face */
		1058	map_clearcell (&lastcell, -1);
		1059	}
		1060	else
		1061	{
		1062	/* In this block, the space is visible.
		1063	*/
		1064
		1065	/* Rather than try to figure out what everything that we might
		1066	* need to send is, then form the packet after that,
		1067	* we presume that we will in fact form a packet, and update
		1068	* the bits by what we do actually send. If we send nothing,
		1069	* we just back out sl.length () to the old value, and no harm
		1070	* is done.
		1071	* I think this is simpler than doing a bunch of checks to see
		1072	* what if anything we need to send, setting the bits, then
		1073	* doing those checks again to add the real data.
		1074	*/
		1075	oldlen = sl.length ();
		1076
		1077	sl << uint16 (mask);
		1078
		1079	unsigned char dummy;
		1080	unsigned char *last_ext = &dummy;
		1081
		1082	/* Darkness changed */
		1083	if (lastcell.count != d)
		1084	{
1133	m = 0;	1085	mask \|= 0x8;
1134		1086
1135	// no, so do it the slow way	1087	*last_ext \|= 0x80;
1136	if (!m)	1088	last_ext = &sl[sl.length ()];
		1089	sl << uint8 (d);
		1090	}
		1091
		1092	lastcell.count = d;
		1093
		1094	mapspace &ms = m->at (nx, ny);
		1095	ms.update ();
		1096
		1097	// extmap handling
		1098	uint8 stat_hp = 0;
		1099	uint8 stat_width = 0;
		1100	uint8 flags = 0;
		1101	tag_t player = 0;
		1102
		1103	// send hp information, if applicable
		1104	if (object *op = ms.faces_obj [0])
		1105	if (op->is_head () && !op->invisible)
1137	{	1106	{
1138	nx = ob->x + dx; ny = ob->y + dy; m = ob->map;	1107	if (op->stats.maxhp > op->stats.hp
1139		1108	&& op->stats.maxhp > 0
1140	if (xy_normalise (m, nx, ny))	1109	&& (op->type == PLAYER
1141	m->touch ();	1110	\|\| op->type == DOOR // does not work, have maxhp 0
1142	else	1111	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1112	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1113	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1143	m = 0;	1114	{
		1115	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1116	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1117	}
		1118
		1119	if (expect_false (op->has_dialogue ()))
		1120	flags \|= 1;
		1121
		1122	if (expect_false (op->type == PLAYER))
		1123	player = op == ob ? pl->ob->count
		1124	: op == pl->ob ? ob->count
		1125	: op->count;
1144	}	1126	}
1145		1127
1146	int ax = dx + hx;	1128	if (expect_false (lastcell.stat_hp != stat_hp))
1147	int ay = dy + hy;
1148
1149	int emask, mask;
1150	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1151
1152	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1153
1154	/* If the coordinates are not valid, or it is too dark to see,
1155	* we tell the client as such
1156	*/
1157	if (!m)
1158	{	1129	{
1159	/* space is out of map. Update space and clear values	1130	lastcell.stat_hp = stat_hp;
1160	* if this hasn't already been done. If the space is out	1131
1161	* of the map, it shouldn't have a head.	1132	mask \|= 0x8;
1162	*/	1133	*last_ext \|= 0x80;
1163	if (lastcell.count != -1)	1134	last_ext = &sl[sl.length ()];
		1135
		1136	sl << uint8 (5) << uint8 (stat_hp);
		1137
		1138	if (stat_width > 1)
1164	{	1139	{
1165	sl << uint16 (mask);
1166	map_clearcell (&lastcell, -1);
1167	}
1168
1169	continue;
1170	}
1171
1172	int d = pl->blocked_los_uc (dx, dy);
1173
1174	if (d > 3)
1175	{
1176	int need_send = 0, count;
1177
1178	/* This block deals with spaces that are not visible for whatever
1179	* reason. Still may need to send the head for this space.
1180	*/
1181
1182	oldlen = sl.length ();
1183
1184	sl << uint16 (mask);
1185
1186	if (lastcell.count != -1)
1187	need_send = 1;
1188
1189	count = -1;
1190
1191	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1192	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1193	need_send = 1;
1194
1195	/* properly clear a previously sent big face */
1196	map_clearcell (&lastcell, count);
1197
1198	if ((mask & 0xf) \|\| need_send)
1199	sl[oldlen + 1] = mask & 0xff;
1200	else
1201	sl.reset (oldlen);
1202	}
1203	else
1204	{
1205	/* In this block, the space is visible.
1206	*/
1207
1208	/* Rather than try to figure out what everything that we might
1209	* need to send is, then form the packet after that,
1210	* we presume that we will in fact form a packet, and update
1211	* the bits by what we do actually send. If we send nothing,
1212	* we just back out sl.length () to the old value, and no harm
1213	* is done.
1214	* I think this is simpler than doing a bunch of checks to see
1215	* what if anything we need to send, setting the bits, then
1216	* doing those checks again to add the real data.
1217	*/
1218	oldlen = sl.length ();
1219	eoldlen = esl.length ();
1220
1221	sl << uint16 (mask);
1222
1223	unsigned char dummy;
1224	unsigned char *last_ext = &dummy;
1225
1226	/* Darkness changed */
1227	if (lastcell.count != d && socket.darkness)
1228	{
1229	mask \|= 0x8;
1230
1231	if (socket.extmap)
1232	{
1233	*last_ext \|= 0x80;	1140	*last_ext \|= 0x80;
1234	last_ext = &sl[sl.length ()];	1141	last_ext = &sl[sl.length ()];
1235	sl << uint8 (d);	1142
1236	}	1143	sl << uint8 (6) << uint8 (stat_width);
1237	else
1238	sl << uint8 (255 - 64 * d);
1239	}	1144	}
		1145	}
1240		1146
1241	lastcell.count = d;	1147	if (expect_false (lastcell.player != player))
1242
1243	mapspace &ms = m->at (nx, ny);
1244	ms.update ();
1245
1246	if (socket.extmap)
1247	{	1148	{
1248	uint8 stat_hp = 0;	1149	lastcell.player = player;
1249	uint8 stat_width = 0;
1250	uint8 flags = 0;
1251	tag_t player = 0;
1252		1150
1253	// send hp information, if applicable
1254	if (object *op = ms.faces_obj [0])
1255	if (op->is_head () && !op->invisible)
1256	{
1257	if (op->stats.maxhp > op->stats.hp
1258	&& op->stats.maxhp > 0
1259	&& (op->type == PLAYER
1260	\|\| op->type == DOOR // does not work, have maxhp 0
1261	\|\| QUERY_FLAG (op, FLAG_MONSTER)
1262	\|\| QUERY_FLAG (op, FLAG_ALIVE)
1263	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1264	{
1265	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1266	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1267	}
1268
1269	if (op->has_dialogue ())
1270	flags \|= 1;
1271
1272	if (op->type == PLAYER)
1273	player = op == ob ? pl->ob->count
1274	: op == pl->ob ? ob->count
1275	: op->count;
1276	}
1277
1278	if (lastcell.stat_hp != stat_hp)
1279	{
1280	lastcell.stat_hp = stat_hp;
1281
1282	mask \|= 0x8;	1151	mask \|= 0x8;
1283	*last_ext \|= 0x80;	1152	*last_ext \|= 0x80;
1284	last_ext = &sl[sl.length ()];	1153	last_ext = &sl[sl.length ()];
1285		1154
1286	sl << uint8 (5) << uint8 (stat_hp);
1287
1288	if (stat_width > 1)
1289	{
1290	*last_ext \|= 0x80;
1291	last_ext = &sl[sl.length ()];
1292
1293	sl << uint8 (6) << uint8 (stat_width);
1294	}
1295	}
1296
1297	if (lastcell.player != player)
1298	{
1299	lastcell.player = player;
1300
1301	mask \|= 0x8;
1302	*last_ext \|= 0x80;
1303	last_ext = &sl[sl.length ()];
1304
1305	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1155	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1306	}	1156	}
1307		1157
1308	if (lastcell.flags != flags)	1158	if (expect_false (lastcell.flags != flags))
1309	{	1159	{
1310	lastcell.flags = flags;	1160	lastcell.flags = flags;
1311		1161
1312	mask \|= 0x8;	1162	mask \|= 0x8;
1313	*last_ext \|= 0x80;	1163	*last_ext \|= 0x80;
1314	last_ext = &sl[sl.length ()];	1164	last_ext = &sl[sl.length ()];
1315		1165
1316	sl << uint8 (8) << uint8 (flags);	1166	sl << uint8 (8) << uint8 (flags);
1317	}
1318	}	1167	}
1319		1168
		1169	// faces
		1170
1320	/* Floor face */	1171	/* Floor face */
1321	if (update_space (sl, socket, ms, lastcell, 2))	1172	if (update_space (sl, socket, ms, lastcell, 2))
1322	mask \|= 0x4;	1173	mask \|= 0x4;
1323		1174
1324	/* Middle face */	1175	/* Middle face */
1325	if (update_space (sl, socket, ms, lastcell, 1))	1176	if (update_space (sl, socket, ms, lastcell, 1))
1326	mask \|= 0x2;	1177	mask \|= 0x2;
1327		1178
1328	if (ob->invisible	1179	if (expect_false (ob->invisible)
1329	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)	1180	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1330	&& ms.player () == ob)	1181	&& ms.player () == ob)
1331	{	1182	{
1332	// force player to be visible to himself if invisible	1183	// force player to be visible to himself if invisible
1333	if (lastcell.faces[0] != ob->face)	1184	if (lastcell.faces[0] != ob->face)
1334	{	1185	{
1335	lastcell.faces[0] = ob->face;	1186	lastcell.faces[0] = ob->face;
1336		1187
1337	mask \|= 0x1;
1338	sl << uint16 (ob->face);
1339
1340	socket.send_faces (ob);
1341	}
1342	}
1343	/* Top face */
1344	else if (update_space (sl, socket, ms, lastcell, 0))
1345	mask \|= 0x1;	1188	mask \|= 0x1;
		1189	sl << uint16 (ob->face);
1346		1190
		1191	socket.send_faces (ob);
		1192	}
		1193	}
		1194	/* Top face */
		1195	else if (update_space (sl, socket, ms, lastcell, 0))
		1196	mask \|= 0x1;
		1197
1347	/* Check to see if we are in fact sending anything for this	1198	/* Check to see if we are in fact sending anything for this
1348	* space by checking the mask. If so, update the mask.	1199	* space by checking the mask. If so, update the mask.
1349	* if not, reset the len to that from before adding the mask	1200	* if not, reset the len to that from before adding the mask
1350	* value, so we don't send those bits.	1201	* value, so we don't send those bits.
1351	*/	1202	*/
1352	if (mask & 0xf)	1203	if (mask & 0xf)
1353	sl[oldlen + 1] = mask & 0xff;	1204	sl[oldlen + 1] = mask & 0xff;
1354	else	1205	else
1355	sl.reset (oldlen);	1206	sl.reset (oldlen);
1356
1357	if (socket.ext_mapinfos)
1358	esl << uint16 (emask);
1359
1360	if (socket.EMI_smooth)
1361	{
1362	for (int layer = 2+1; layer--; )
1363	{
1364	object *ob = ms.faces_obj [layer];
1365
1366	// If there is no object for this space, or if the face for the object
1367	// is the blank face, set the smoothlevel to zero.
1368	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1369
1370	// We've gotten what face we want to use for the object. Now see if
1371	// if it has changed since we last sent it to the client.
1372	if (lastcell.smooth[layer] != smoothlevel)
1373	{
1374	lastcell.smooth[layer] = smoothlevel;
1375	esl << uint8 (smoothlevel);
1376	emask \|= 1 << layer;
1377	}
1378	}
1379
1380	if (emask & 0xf)
1381	esl[eoldlen + 1] = emask & 0xff;
1382	else
1383	esl.reset (eoldlen);
1384	}
1385	} /* else this is a viewable space */	1207	} /* else this is a viewable space */
1386	} /* for x loop */	1208	ordered_mapwalk_end
1387	} /* for y loop */
1388		1209
1389	socket.flush_fx ();	1210	socket.flush_fx ();
1390
1391	/* Verify that we in fact do need to send this */
1392	if (socket.ext_mapinfos)
1393	{
1394	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1395	{
1396	/* No map data will follow, so don't say the client
1397	* it doesn't need draw!
1398	*/
1399	ewhatflag &= ~EMI_NOREDRAW;
1400	esl[ewhatstart + 1] = ewhatflag & 0xff;
1401	}
1402
1403	if (esl.length () > estartlen)
1404	socket.send_packet (esl);
1405	}
1406		1211
1407	if (sl.length () > startlen \|\| socket.sent_scroll)	1212	if (sl.length () > startlen \|\| socket.sent_scroll)
1408	{	1213	{
1409	socket.send_packet (sl);	1214	socket.send_packet (sl);
1410	socket.sent_scroll = 0;	1215	socket.sent_scroll = 0;

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.142 by root, Sat Dec 20 02:32:31 2008 UTC vs. Revision 1.150 by root, Mon Oct 12 14:00:59 2009 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.142 by root, Sat Dec 20 02:32:31 2008 UTC vs.
Revision 1.150 by root, Mon Oct 12 14:00:59 2009 UTC