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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.141 by root, Fri Dec 19 22:47:30 2008 UTC vs.
Revision 1.147 by root, Sat Dec 27 08:41:44 2008 UTC

…		…
98	*/	98	*/
99	mx = ns->mapx;	99	mx = ns->mapx;
100	my = ns->mapy;	100	my = ns->mapy;
101		101
102	/* the x and y here are coordinates for the new map, i.e. if we moved	102	/* 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,	103	* (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	104	* if the destination x or y coordinate is outside the viewable
105	* area, we clear the values - otherwise, the old values	105	* area, we clear the values - otherwise, the old values
106	* are preserved, and the check_head thinks it needs to clear them.	106	* are preserved, and the check_head thinks it needs to clear them.
107	*/	107	*/
108	for (x = 0; x < mx; x++)	108	for (x = 0; x < mx; x++)
109	{
110	for (y = 0; y < my; y++)	109	for (y = 0; y < my; y++)
111	{
112	if (x >= ns->mapx \|\| y >= ns->mapy)	110	if (x >= ns->mapx \|\| y >= ns->mapy)
113	/* clear cells outside the viewable area */	111	/* clear cells outside the viewable area */
114	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	112	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)	113	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 */	114	/* clear newly visible tiles within the viewable area */
117	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	115	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118	else	116	else
119	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	117	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120	}
121	}
122		118
123	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	119	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124		120
125	/* Make sure that the next "map1" command will be sent (even if it is	121	/* Make sure that the next "map1" command will be sent (even if it is
126	* empty).	122	* empty).
…		…
212	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)	208	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)
213	{	209	{
214	int dx = ob->x - socket.current_x;	210	int dx = ob->x - socket.current_x;
215	int dy = ob->y - socket.current_y;	211	int dy = ob->y - socket.current_y;
216		212
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);	213	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
222	socket.floorbox_reset ();	214	socket.floorbox_reset ();
223	}
224	}	215	}
225		216
226	socket.current_x = ob->x;	217	socket.current_x = ob->x;
227	socket.current_y = ob->y;	218	socket.current_y = ob->y;
228	}	219	}
…		…
406	*/	397	*/
407	void	398	void
408	AddMeCmd (char buf, int len, client ns)	399	AddMeCmd (char buf, int len, client ns)
409	{	400	{
410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	401	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
411	}
412
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	}	402	}
465		403
466	/*	404	/*
467	#define MSG_TYPE_BOOK 1	405	#define MSG_TYPE_BOOK 1
468	#define MSG_TYPE_CARD 2	406	#define MSG_TYPE_CARD 2
…		…
988		926
989	/* Nothing changed */	927	/* Nothing changed */
990	return 0;	928	return 0;
991	}	929	}
992		930
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	931	// prefetch (and touch) all maps within a specific distancd
1013	static void	932	static void
1014	prefetch_surrounding_maps (maptile *map, int distance)	933	prefetch_surrounding_maps (maptile *map, int distance)
1015	{	934	{
1016	map->last_access = runtime;	935	map->touch ();
1017		936
1018	if (--distance)	937	if (--distance)
1019	for (int dir = 4; --dir; )	938	for (int dir = 4; --dir; )
1020	if (const shstr &path = map->tile_path [dir])	939	if (const shstr &path = map->tile_path [dir])
1021	if (maptile *&neigh = map->tile_map [dir])	940	if (maptile *&neigh = map->tile_map [dir])
…		…
1047	*/	966	*/
1048	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	967	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1049	return;	968	return;
1050		969
1051	int startlen, oldlen;	970	int startlen, oldlen;
1052	int estartlen, eoldlen;
1053	uint8 eentrysize;
1054	uint16 ewhatstart, ewhatflag;
1055	uint8 extendedinfos;
1056		971
1057	check_map_change (pl);	972	check_map_change (pl);
1058	prefetch_surrounding_maps (pl->ob);	973	prefetch_surrounding_maps (pl->ob);
1059		974
1060	/* do LOS after calls to update_position */	975	/* do LOS after calls to update_position */
1061	if (ob != pl->ob)	976	/* unfortunately, we need to udpate los when observing, currently */
1062	clear_los (pl);	977	if (pl->do_los \|\| pl->observe != pl->ob)
1063	else if (pl->do_los)
1064	{	978	{
1065	update_los (ob);
1066	pl->do_los = 0;	979	pl->do_los = 0;
		980	pl->update_los ();
1067	}	981	}
1068		982
1069	/**	983	/**
1070	* This function uses the new map1 protocol command to send the map	984	* 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	985	* to the client. It is necessary because the old map command supports
…		…
1090	*/	1004	*/
1091		1005
1092	client &socket = *pl->ns;	1006	client &socket = *pl->ns;
1093		1007
1094	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1008	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1095	packet esl;
1096		1009
1097	startlen = sl.length ();	1010	startlen = sl.length ();
1098		1011
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;	1012	int hx = socket.mapx / 2;
1122	int hy = socket.mapy / 2;	1013	int hy = socket.mapy / 2;
1123		1014
1124	for (int dx = -hx; dx <= hx; dx++)	1015	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1125	{
1126	sint16 nx, ny;
1127	maptile *m = 0;
1128
1129	for (int dy = -hy; dy <= hy; dy++)
1130	{
1131	// check to see if we can simply go one down quickly
1132	if (m && ++ny >= m->height)
1133	m = 0;
1134
1135	// no, so do it the slow way
1136	if (!m)
1137	{
1138	nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1139
1140	if (xy_normalise (m, nx, ny))
1141	m->touch ();
1142	else
1143	m = 0;
1144	}
1145
1146	int ax = dx + hx;	1016	int ax = dx + hx;
1147	int ay = dy + hy;	1017	int ay = dy + hy;
1148		1018
1149	int emask, mask;	1019	int mask = (ax << 10) \| (ay << 4);
1150	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1151
1152	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1020	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1153		1021
1154	/* If the coordinates are not valid, or it is too dark to see,	1022	/* If the coordinates are not valid, or it is too dark to see,
1155	* we tell the client as such	1023	* we tell the client as such
1156	*/	1024	*/
1157	if (!m)	1025	if (!m)
1158	{	1026	{
1159	/* space is out of map. Update space and clear values	1027	/* space is out of map. Update space and clear values
1160	* if this hasn't already been done. If the space is out	1028	* if this hasn't already been done. If the space is out
1161	* of the map, it shouldn't have a head.	1029	* of the map, it shouldn't have a head.
1162	*/	1030	*/
1163	if (lastcell.count != -1)	1031	if (lastcell.count != -1)
		1032	{
		1033	sl << uint16 (mask);
		1034	map_clearcell (&lastcell, -1);
		1035	}
		1036
		1037	continue;
		1038	}
		1039
		1040	int d = pl->blocked_los_uc (dx, dy);
		1041
		1042	if (d > 3)
		1043	{
		1044	/* This block deals with spaces that are not visible for whatever
		1045	* reason. Still may need to send the head for this space.
		1046	*/
		1047	if (lastcell.count != -1
		1048	\|\| lastcell.faces[0]
		1049	\|\| lastcell.faces[1]
		1050	\|\| lastcell.faces[2]
		1051	\|\| lastcell.stat_hp
		1052	\|\| lastcell.flags
		1053	\|\| lastcell.player)
		1054	sl << uint16 (mask);
		1055
		1056	/* properly clear a previously sent big face */
		1057	map_clearcell (&lastcell, -1);
		1058	}
		1059	else
		1060	{
		1061	/* In this block, the space is visible.
		1062	*/
		1063
		1064	/* Rather than try to figure out what everything that we might
		1065	* need to send is, then form the packet after that,
		1066	* we presume that we will in fact form a packet, and update
		1067	* the bits by what we do actually send. If we send nothing,
		1068	* we just back out sl.length () to the old value, and no harm
		1069	* is done.
		1070	* I think this is simpler than doing a bunch of checks to see
		1071	* what if anything we need to send, setting the bits, then
		1072	* doing those checks again to add the real data.
		1073	*/
		1074	oldlen = sl.length ();
		1075
		1076	sl << uint16 (mask);
		1077
		1078	unsigned char dummy;
		1079	unsigned char *last_ext = &dummy;
		1080
		1081	/* Darkness changed */
		1082	if (lastcell.count != d)
		1083	{
		1084	mask \|= 0x8;
		1085
		1086	if (socket.extmap)
		1087	{
		1088	*last_ext \|= 0x80;
		1089	last_ext = &sl[sl.length ()];
		1090	sl << uint8 (d);
		1091	}
		1092	else
		1093	sl << uint8 (255 - 64 * d);
		1094	}
		1095
		1096	lastcell.count = d;
		1097
		1098	mapspace &ms = m->at (nx, ny);
		1099	ms.update ();
		1100
		1101	if (expect_true (socket.extmap))
		1102	{
		1103	uint8 stat_hp = 0;
		1104	uint8 stat_width = 0;
		1105	uint8 flags = 0;
		1106	tag_t player = 0;
		1107
		1108	// send hp information, if applicable
		1109	if (object *op = ms.faces_obj [0])
		1110	if (op->is_head () && !op->invisible)
1164	{	1111	{
1165	sl << uint16 (mask);	1112	if (op->stats.maxhp > op->stats.hp
1166	map_clearcell (&lastcell, -1);	1113	&& op->stats.maxhp > 0
		1114	&& (op->type == PLAYER
		1115	\|\| op->type == DOOR // does not work, have maxhp 0
		1116	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1117	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1118	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
		1119	{
		1120	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1121	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1122	}
		1123
		1124	if (expect_false (op->has_dialogue ()))
		1125	flags \|= 1;
		1126
		1127	if (expect_false (op->type == PLAYER))
		1128	player = op == ob ? pl->ob->count
		1129	: op == pl->ob ? ob->count
		1130	: op->count;
1167	}	1131	}
1168		1132
1169	continue;	1133	if (expect_false (lastcell.stat_hp != stat_hp))
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	{	1134	{
		1135	lastcell.stat_hp = stat_hp;
		1136
1229	mask \|= 0x8;	1137	mask \|= 0x8;
		1138	*last_ext \|= 0x80;
		1139	last_ext = &sl[sl.length ()];
1230		1140
1231	if (socket.extmap)	1141	sl << uint8 (5) << uint8 (stat_hp);
		1142
		1143	if (stat_width > 1)
1232	{	1144	{
1233	*last_ext \|= 0x80;	1145	*last_ext \|= 0x80;
1234	last_ext = &sl[sl.length ()];	1146	last_ext = &sl[sl.length ()];
1235	sl << uint8 (d);
1236	}
1237	else
1238	sl << uint8 (255 - 64 * d);
1239	}
1240		1147
1241	lastcell.count = d;
1242
1243	mapspace &ms = m->at (nx, ny);
1244	ms.update ();
1245
1246	if (socket.extmap)
1247	{
1248	uint8 stat_hp = 0;
1249	uint8 stat_width = 0;
1250	uint8 flags = 0;
1251	tag_t player = 0;
1252
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;
1283	*last_ext \|= 0x80;
1284	last_ext = &sl[sl.length ()];
1285
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);	1148	sl << uint8 (6) << uint8 (stat_width);
1294	}
1295	}	1149	}
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;
1306	}
1307
1308	if (lastcell.flags != flags)
1309	{
1310	lastcell.flags = flags;
1311
1312	mask \|= 0x8;
1313	*last_ext \|= 0x80;
1314	last_ext = &sl[sl.length ()];
1315
1316	sl << uint8 (8) << uint8 (flags);
1317	}
1318	}	1150	}
1319		1151
1320	/* Floor face */	1152	if (expect_false (lastcell.player != player))
1321	if (update_space (sl, socket, ms, lastcell, 2))	1153	{
		1154	lastcell.player = player;
		1155
1322	mask \|= 0x4;	1156	mask \|= 0x8;
		1157	*last_ext \|= 0x80;
		1158	last_ext = &sl[sl.length ()];
1323		1159
1324	/* Middle face */	1160	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1325	if (update_space (sl, socket, ms, lastcell, 1))	1161	}
		1162
		1163	if (expect_false (lastcell.flags != flags))
		1164	{
		1165	lastcell.flags = flags;
		1166
1326	mask \|= 0x2;	1167	mask \|= 0x8;
		1168	*last_ext \|= 0x80;
		1169	last_ext = &sl[sl.length ()];
1327		1170
1328	if (ob->invisible	1171	sl << uint8 (8) << uint8 (flags);
		1172	}
		1173	}
		1174
		1175	/* Floor face */
		1176	if (update_space (sl, socket, ms, lastcell, 2))
		1177	mask \|= 0x4;
		1178
		1179	/* Middle face */
		1180	if (update_space (sl, socket, ms, lastcell, 1))
		1181	mask \|= 0x2;
		1182
		1183	if (expect_false (ob->invisible)
1329	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)	1184	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1330	&& ms.player () == ob)	1185	&& ms.player () == ob)
1331	{	1186	{
1332	// force player to be visible to himself if invisible	1187	// force player to be visible to himself if invisible
1333	if (lastcell.faces[0] != ob->face)	1188	if (lastcell.faces[0] != ob->face)
1334	{	1189	{
1335	lastcell.faces[0] = ob->face;	1190	lastcell.faces[0] = ob->face;
1336		1191
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;	1192	mask \|= 0x1;
		1193	sl << uint16 (ob->face);
1346		1194
		1195	socket.send_faces (ob);
		1196	}
		1197	}
		1198	/* Top face */
		1199	else if (update_space (sl, socket, ms, lastcell, 0))
		1200	mask \|= 0x1;
		1201
1347	/* Check to see if we are in fact sending anything for this	1202	/* Check to see if we are in fact sending anything for this
1348	* space by checking the mask. If so, update the mask.	1203	* space by checking the mask. If so, update the mask.
1349	* if not, reset the len to that from before adding the mask	1204	* if not, reset the len to that from before adding the mask
1350	* value, so we don't send those bits.	1205	* value, so we don't send those bits.
1351	*/	1206	*/
1352	if (mask & 0xf)	1207	if (mask & 0xf)
1353	sl[oldlen + 1] = mask & 0xff;	1208	sl[oldlen + 1] = mask & 0xff;
1354	else	1209	else
1355	sl.reset (oldlen);	1210	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 */	1211	} /* else this is a viewable space */
1386	} /* for x loop */	1212	ordered_mapwalk_end
1387	} /* for y loop */
1388		1213
1389	socket.flush_fx ();	1214	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		1215
1407	if (sl.length () > startlen \|\| socket.sent_scroll)	1216	if (sl.length () > startlen \|\| socket.sent_scroll)
1408	{	1217	{
1409	socket.send_packet (sl);	1218	socket.send_packet (sl);
1410	socket.sent_scroll = 0;	1219	socket.sent_scroll = 0;

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.141 by root, Fri Dec 19 22:47:30 2008 UTC vs. Revision 1.147 by root, Sat Dec 27 08:41:44 2008 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.141 by root, Fri Dec 19 22:47:30 2008 UTC vs.
Revision 1.147 by root, Sat Dec 27 08:41:44 2008 UTC