[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.146 by root, Sat Dec 27 01:25:00 2008 UTC

…		…
208	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)
209	{	209	{
210	int dx = ob->x - socket.current_x;	210	int dx = ob->x - socket.current_x;
211	int dy = ob->y - socket.current_y;	211	int dy = ob->y - socket.current_y;
212		212
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);	213	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218	socket.floorbox_reset ();	214	socket.floorbox_reset ();
219	}
220	}	215	}
221		216
222	socket.current_x = ob->x;	217	socket.current_x = ob->x;
223	socket.current_y = ob->y;	218	socket.current_y = ob->y;
224	}	219	}
…		…
402	*/	397	*/
403	void	398	void
404	AddMeCmd (char buf, int len, client ns)	399	AddMeCmd (char buf, int len, client ns)
405	{	400	{
406	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	401	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
407	}
408
409	/** Reply to ExtendedInfos command */
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	}	402	}
461		403
462	/*	404	/*
463	#define MSG_TYPE_BOOK 1	405	#define MSG_TYPE_BOOK 1
464	#define MSG_TYPE_CARD 2	406	#define MSG_TYPE_CARD 2
…		…
984		926
985	/* Nothing changed */	927	/* Nothing changed */
986	return 0;	928	return 0;
987	}	929	}
988		930
989	/**
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
1008	// prefetch (and touch) all maps within a specific distancd	931	// prefetch (and touch) all maps within a specific distancd
1009	static void	932	static void
1010	prefetch_surrounding_maps (maptile *map, int distance)	933	prefetch_surrounding_maps (maptile *map, int distance)
1011	{	934	{
1012	map->last_access = runtime;	935	map->last_access = runtime;
…		…
1043	*/	966	*/
1044	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	967	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1045	return;	968	return;
1046		969
1047	int startlen, oldlen;	970	int startlen, oldlen;
1048	int estartlen, eoldlen;
1049	uint8 eentrysize;
1050	uint16 ewhatstart, ewhatflag;
1051	uint8 extendedinfos;
1052		971
1053	check_map_change (pl);	972	check_map_change (pl);
1054	prefetch_surrounding_maps (pl->ob);	973	prefetch_surrounding_maps (pl->ob);
1055		974
1056	/* do LOS after calls to update_position */	975	/* do LOS after calls to update_position */
…		…
1085	*/	1004	*/
1086		1005
1087	client &socket = *pl->ns;	1006	client &socket = *pl->ns;
1088		1007
1089	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1008	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1090	packet esl;
1091		1009
1092	startlen = sl.length ();	1010	startlen = sl.length ();
1093		1011
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;	1012	int hx = socket.mapx / 2;
1117	int hy = socket.mapy / 2;	1013	int hy = socket.mapy / 2;
1118		1014
1119	for (int dx = -hx; dx <= hx; dx++)	1015	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1120	{
1121	sint16 nx, ny;
1122	maptile *m = 0;
1123
1124	for (int dy = -hy; dy <= hy; dy++)
1125	{
1126	// check to see if we can simply go one down quickly
1127	if (m && ++ny >= m->height)
1128	m = 0;
1129
1130	// no, so do it the slow way
1131	if (!m)
1132	{
1133	nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1134
1135	if (xy_normalise (m, nx, ny))
1136	m->touch ();
1137	else
1138	m = 0;
1139	}
1140
1141	int ax = dx + hx;	1016	int ax = dx + hx;
1142	int ay = dy + hy;	1017	int ay = dy + hy;
1143		1018
1144	int emask, mask;	1019	int mask = (ax << 10) \| (ay << 4);
1145	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1146
1147	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1020	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1148		1021
1149	/* 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,
1150	* we tell the client as such	1023	* we tell the client as such
1151	*/	1024	*/
1152	if (!m)	1025	if (!m)
1153	{	1026	{
1154	/* space is out of map. Update space and clear values	1027	/* space is out of map. Update space and clear values
1155	* 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
1156	* of the map, it shouldn't have a head.	1029	* of the map, it shouldn't have a head.
1157	*/	1030	*/
1158	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)
1159	{	1111	{
1160	sl << uint16 (mask);	1112	if (op->stats.maxhp > op->stats.hp
1161	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;
1162	}	1131	}
1163		1132
1164	continue;	1133	if (expect_false (lastcell.stat_hp != stat_hp))
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	{	1134	{
		1135	lastcell.stat_hp = stat_hp;
		1136
1224	mask \|= 0x8;	1137	mask \|= 0x8;
		1138	*last_ext \|= 0x80;
		1139	last_ext = &sl[sl.length ()];
1225		1140
1226	if (socket.extmap)	1141	sl << uint8 (5) << uint8 (stat_hp);
		1142
		1143	if (stat_width > 1)
1227	{	1144	{
1228	*last_ext \|= 0x80;	1145	*last_ext \|= 0x80;
1229	last_ext = &sl[sl.length ()];	1146	last_ext = &sl[sl.length ()];
1230	sl << uint8 (d);
1231	}
1232	else
1233	sl << uint8 (255 - 64 * d);
1234	}
1235		1147
1236	lastcell.count = d;
1237
1238	mapspace &ms = m->at (nx, ny);
1239	ms.update ();
1240
1241	if (socket.extmap)
1242	{
1243	uint8 stat_hp = 0;
1244	uint8 stat_width = 0;
1245	uint8 flags = 0;
1246	tag_t player = 0;
1247
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;
1278	*last_ext \|= 0x80;
1279	last_ext = &sl[sl.length ()];
1280
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);	1148	sl << uint8 (6) << uint8 (stat_width);
1289	}
1290	}	1149	}
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;
1301	}
1302
1303	if (lastcell.flags != flags)
1304	{
1305	lastcell.flags = flags;
1306
1307	mask \|= 0x8;
1308	*last_ext \|= 0x80;
1309	last_ext = &sl[sl.length ()];
1310
1311	sl << uint8 (8) << uint8 (flags);
1312	}
1313	}	1150	}
1314		1151
1315	/* Floor face */	1152	if (expect_false (lastcell.player != player))
1316	if (update_space (sl, socket, ms, lastcell, 2))	1153	{
		1154	lastcell.player = player;
		1155
1317	mask \|= 0x4;	1156	mask \|= 0x8;
		1157	*last_ext \|= 0x80;
		1158	last_ext = &sl[sl.length ()];
1318		1159
1319	/* Middle face */	1160	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1320	if (update_space (sl, socket, ms, lastcell, 1))	1161	}
		1162
		1163	if (expect_false (lastcell.flags != flags))
		1164	{
		1165	lastcell.flags = flags;
		1166
1321	mask \|= 0x2;	1167	mask \|= 0x8;
		1168	*last_ext \|= 0x80;
		1169	last_ext = &sl[sl.length ()];
1322		1170
1323	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)
1324	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)	1184	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1325	&& ms.player () == ob)	1185	&& ms.player () == ob)
1326	{	1186	{
1327	// force player to be visible to himself if invisible	1187	// force player to be visible to himself if invisible
1328	if (lastcell.faces[0] != ob->face)	1188	if (lastcell.faces[0] != ob->face)
1329	{	1189	{
1330	lastcell.faces[0] = ob->face;	1190	lastcell.faces[0] = ob->face;
1331		1191
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;	1192	mask \|= 0x1;
		1193	sl << uint16 (ob->face);
1341		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
1342	/* 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
1343	* space by checking the mask. If so, update the mask.	1203	* space by checking the mask. If so, update the mask.
1344	* 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
1345	* value, so we don't send those bits.	1205	* value, so we don't send those bits.
1346	*/	1206	*/
1347	if (mask & 0xf)	1207	if (mask & 0xf)
1348	sl[oldlen + 1] = mask & 0xff;	1208	sl[oldlen + 1] = mask & 0xff;
1349	else	1209	else
1350	sl.reset (oldlen);	1210	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 */	1211	} /* else this is a viewable space */
1381	} /* for x loop */	1212	ordered_mapwalk_end
1382	} /* for y loop */
1383		1213
1384	socket.flush_fx ();	1214	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		1215
1402	if (sl.length () > startlen \|\| socket.sent_scroll)	1216	if (sl.length () > startlen \|\| socket.sent_scroll)
1403	{	1217	{
1404	socket.send_packet (sl);	1218	socket.send_packet (sl);
1405	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.143 by root, Tue Dec 23 06:58:24 2008 UTC vs. Revision 1.146 by root, Sat Dec 27 01:25:00 2008 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.146 by root, Sat Dec 27 01:25:00 2008 UTC