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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.74 by root, Wed Mar 14 01:19:10 2007 UTC vs.
Revision 1.78 by root, Thu Mar 15 14:59:43 2007 UTC

…		…
459	char tmpbuf[20];	459	char tmpbuf[20];
460	int q = atoi (param);	460	int q = atoi (param);
461		461
462	if (is_valid_faceset (q))	462	if (is_valid_faceset (q))
463	ns->faceset = q;	463	ns->faceset = q;
		464
464	sprintf (tmpbuf, "%d", ns->faceset);	465	sprintf (tmpbuf, "%d", ns->faceset);
465	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);	466	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466	/* if the client is using faceset, it knows about image2 command */	467	/* if the client is using faceset, it knows about image2 command */
467	ns->image2 = 1;	468	ns->image2 = 1;
468	}	469	}
…		…
561	* This is what takes care of it. We tell the client how things worked out.	562	* This is what takes care of it. We tell the client how things worked out.
562	* I am not sure if this file is the best place for this function. however,	563	* I am not sure if this file is the best place for this function. however,
563	* it either has to be here or init_sockets needs to be exported.	564	* it either has to be here or init_sockets needs to be exported.
564	*/	565	*/
565	void	566	void
566	AddMeCmd (char buf, int len, client ns)	567	AddMeCmd (char buf, int len, client ns)
567	{	568	{
		569	// face caching is mandatory
		570	if (!ns->facecache)
		571	{
		572	ns->send_drawinfo (
		573	"\n"
		574	"\n"
		575	"***\n"
		576	"*** WARNING:\n"
		577	"*** Your client does not support face/image caching,\n"
		578	"*** or it has been disabled. Face caching is mandatory\n"
		579	"*** so please enable it or use a newer client.\n"
		580	"***\n"
		581	"*** Look at your client preferences:\n"
		582	"***\n"
		583	"*** CFPlus: all known versions automatically enable the facecache.\n"
		584	"*** cfclient: use the -cache commandline option.\n"
		585	"*** cfclient: map will not redraw automatically (bug).\n"
		586	"*** gcfclient: use -cache commandline option, or enable\n"
		587	"*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
		588	"*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
		589	"***\n"
		590	"***\n",
		591	NDI_RED
		592	);
		593
		594	if (strstr (ns->version, "jcrossclient"))
		595	/* let them, for now*/;
		596	else
		597	{
		598	ns->flush ();
		599	//ns->destroy ();
		600	}
		601	//ns->facecache = true;
		602	}
		603
568	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	604	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569	}	605	}
570		606
571	/** Reply to ExtendedInfos command */	607	/** Reply to ExtendedInfos command */
572	void	608	void
…		…
680	snprintf (temp, sizeof (temp), "%d", i);	716	snprintf (temp, sizeof (temp), "%d", i);
681	strcat (cmdback, temp);	717	strcat (cmdback, temp);
682	}	718	}
683		719
684	ns->send_packet (cmdback);	720	ns->send_packet (cmdback);
		721	}
		722
		723	/**
		724	* client requested an image. send it rate-limited
		725	* before flushing.
		726	*/
		727	void
		728	AskFaceCmd (char buf, int len, client ns)
		729	{
		730	ns->askface.push_back (atoi (buf));
685	}	731	}
686		732
687	/**	733	/**
688	* Tells client the picture it has to use	734	* Tells client the picture it has to use
689	* to smooth a picture number given as argument.	735	* to smooth a picture number given as argument.
…		…
1081		1127
1082	/** Clears a map cell */	1128	/** Clears a map cell */
1083	static void	1129	static void
1084	map_clearcell (struct MapCell *cell, int count)	1130	map_clearcell (struct MapCell *cell, int count)
1085	{	1131	{
1086	cell->faces[0] = 0;	1132	cell->faces[0] = 0;
1087	cell->faces[1] = 0;	1133	cell->faces[1] = 0;
1088	cell->faces[2] = 0;	1134	cell->faces[2] = 0;
		1135	cell->smooth[0] = 0;
		1136	cell->smooth[1] = 0;
		1137	cell->smooth[2] = 0;
1089	cell->count = count;	1138	cell->count = count;
1090	cell->stat_hp = 0;	1139	cell->stat_hp = 0;
1091	cell->flags = 0;	1140	cell->flags = 0;
1092	cell->player = 0;	1141	cell->player = 0;
1093	}	1142	}
1094		1143
1095	#define MAX_LAYERS 3	1144	#define MAX_LAYERS 3
1096		1145
1097	/**	1146	/**
…		…
1100	* it was.	1149	* it was.
1101	* sl is the socklist this data is going into.	1150	* sl is the socklist this data is going into.
1102	* ns is the socket we are working on - all the info we care	1151	* ns is the socket we are working on - all the info we care
1103	* about is in this socket structure, so now need not pass the	1152	* about is in this socket structure, so now need not pass the
1104	* entire player object.	1153	* entire player object.
1105	* mx and my are map coordinate offsets for map mp
1106	* sx and sy are the offsets into the socket structure that
1107	* holds the old values.
1108	* layer is the layer to update, with 2 being the floor and 0 the	1154	* layer is the layer to update, with 2 being the floor and 0 the
1109	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	1155	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1110	* take. Interesting to note that before this function, the map1 function	1156	* take. Interesting to note that before this function, the map1 function
1111	* numbers the spaces differently - I think this was a leftover from	1157	* numbers the spaces differently - I think this was a leftover from
1112	* the map command, where the faces stack up. Sinces that is no longer	1158	* the map command, where the faces stack up. Sinces that is no longer
1113	* the case, it seems to make more sense to have these layer values	1159	* the case, it seems to make more sense to have these layer values
1114	* actually match.	1160	* actually match.
1115	*/	1161	*/
1116	static int	1162	static int
1117	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	1163	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1118	{	1164	{
1119	uint16 face_num;	1165	object *ob = ms.faces_obj [layer];
1120	int bx, by, i;
1121
1122	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1123		1166
1124	/* If there is no object for this space, or if the face for the object	1167	/* If there is no object for this space, or if the face for the object
1125	* is the blank face, set the face number to zero.	1168	* is the blank face, set the face number to zero.
1126	* else if we have the stored head object for this space, that takes	1169	* else if we have the stored head object for this space, that takes
1127	* precedence over the other object for this space.	1170	* precedence over the other object for this space.
1128	* otherwise, we do special head processing	1171	* otherwise, we do special head processing
1129	*/	1172	*/
1130	if (!ob \|\| ob->face == blank_face)	1173	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1131	face_num = 0;
1132	else
1133	/* In this case, we are already at the lower right or single part object,
1134	* so nothing special
1135	*/
1136	face_num = ob->face;
1137		1174
1138	/* We've gotten what face we want to use for the object. Now see if	1175	/* We've gotten what face we want to use for the object. Now see if
1139	* if it has changed since we last sent it to the client.	1176	* if it has changed since we last sent it to the client.
1140	*/	1177	*/
1141	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	1178	if (lastcell.faces[layer] != face_num)
1142	{	1179	{
1143	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	1180	lastcell.faces[layer] = face_num;
1144		1181
1145	if (!ns.faces_sent[face_num])	1182	if (!ns.faces_sent[face_num])
1146	if (ob)	1183	if (ob)
1147	ns.send_faces (ob);	1184	ns.send_faces (ob);
1148	else	1185	else
1149	ns.send_face (face_num);	1186	ns.send_face (face_num);
1150		1187
1151	sl << uint16 (face_num);	1188	sl << uint16 (face_num);
1152	return 1;
1153	}
1154
1155	/* Nothing changed */
1156	return 0;
1157	}
1158
1159	/**
1160	* This function is mainly a copy of update_space,
1161	* except it handles update of the smoothing updates,
1162	* not the face updates.
1163	* Removes the need to replicate the same code for each layer.
1164	* this returns true if this smooth is now in fact different
1165	* than it was.
1166	* sl is the socklist this data is going into.
1167	* ns is the socket we are working on - all the info we care
1168	* about is in this socket structure, so know need to pass the
1169	* entire player object.
1170	* mx and my are map coordinate offsets for map mp
1171	* sx and sy are the offsets into the socket structure that
1172	* holds the old values.
1173	* layer is the layer to update, with 2 being the floor and 0 the
1174	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1175	* take.
1176	*/
1177	static inline int
1178	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1179	{
1180	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1181
1182	/* If there is no object for this space, or if the face for the object
1183	* is the blank face, set the smoothlevel to zero.
1184	*/
1185	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1186
1187	/* We've gotten what face we want to use for the object. Now see if
1188	* if it has changed since we last sent it to the client.
1189	*/
1190	if (smoothlevel > 255)
1191	smoothlevel = 255;
1192	else if (smoothlevel < 0)
1193	smoothlevel = 0;
1194
1195	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1196	{
1197	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1198	sl << uint8 (smoothlevel);
1199	return 1;	1189	return 1;
1200	}	1190	}
1201		1191
1202	/* Nothing changed */	1192	/* Nothing changed */
1203	return 0;	1193	return 0;
…		…
1306	<< uint8 (extendedinfos)	1296	<< uint8 (extendedinfos)
1307	<< uint8 (eentrysize);	1297	<< uint8 (eentrysize);
1308		1298
1309	estartlen = esl.length ();	1299	estartlen = esl.length ();
1310	}	1300	}
1311	else
1312	{
1313	/* suppress compiler warnings */
1314	ewhatstart = 0;
1315	ewhatflag = 0;
1316	estartlen = 0;
1317	}
1318		1301
1319	/* x,y are the real map locations. ax, ay are viewport relative	1302	/* x,y are the real map locations. ax, ay are viewport relative
1320	* locations.	1303	* locations.
1321	*/	1304	*/
1322	ay = 0;	1305	ay = 0;
…		…
1325	* but that started to get a bit messy to look at.	1308	* but that started to get a bit messy to look at.
1326	*/	1309	*/
1327	max_x = pl->x + (socket.mapx + 1) / 2;	1310	max_x = pl->x + (socket.mapx + 1) / 2;
1328	max_y = pl->y + (socket.mapy + 1) / 2;	1311	max_y = pl->y + (socket.mapy + 1) / 2;
1329		1312
		1313	maptile *plmap = pl->map;
		1314
1330	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1315	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1331	{	1316	{
1332	ax = 0;	1317	ax = 0;
1333	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1318	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1334	{	1319	{
…		…
1340	/* If the coordinates are not valid, or it is too dark to see,	1325	/* If the coordinates are not valid, or it is too dark to see,
1341	* we tell the client as such	1326	* we tell the client as such
1342	*/	1327	*/
1343	nx = x;	1328	nx = x;
1344	ny = y;	1329	ny = y;
1345	m = get_map_from_coord (pl->map, &nx, &ny);	1330	m = get_map_from_coord (plmap, &nx, &ny);
1346		1331
1347	if (!m)	1332	if (!m)
1348	{	1333	{
1349	/* space is out of map. Update space and clear values	1334	/* space is out of map. Update space and clear values
1350	* if this hasn't already been done. If the space is out	1335	* if this hasn't already been done. If the space is out
…		…
1411	oldlen = sl.length ();	1396	oldlen = sl.length ();
1412	eoldlen = esl.length ();	1397	eoldlen = esl.length ();
1413		1398
1414	sl << uint16 (mask);	1399	sl << uint16 (mask);
1415		1400
1416	if (socket.ext_mapinfos)
1417	esl << uint16 (emask);
1418
1419	unsigned char dummy;	1401	unsigned char dummy;
1420	unsigned char *last_ext = &dummy;	1402	unsigned char *last_ext = &dummy;
1421		1403
1422	/* Darkness changed */	1404	/* Darkness changed */
1423	if (lastcell.count != d && socket.darkness)	1405	if (lastcell.count != d && socket.darkness)
…		…
1434	sl << uint8 (255 - 64 * d);	1416	sl << uint8 (255 - 64 * d);
1435	}	1417	}
1436		1418
1437	lastcell.count = d;	1419	lastcell.count = d;
1438		1420
		1421	mapspace &ms = m->at (nx, ny);
		1422
1439	if (socket.extmap)	1423	if (socket.extmap)
1440	{	1424	{
1441	uint8 stat_hp = 0;	1425	uint8 stat_hp = 0;
1442	uint8 stat_width = 0;	1426	uint8 stat_width = 0;
1443	uint8 flags = 0;	1427	uint8 flags = 0;
1444	UUID player = 0;	1428	UUID player = 0;
1445		1429
1446	// send hp information, if applicable	1430	// send hp information, if applicable
1447	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1431	if (object *op = ms.faces_obj [0])
1448	{	1432	{
1449	if (op->head \|\| op->invisible)	1433	if (op->head \|\| op->invisible)
1450	; // do not show	1434	; // do not show
1451	else if (op->type == PLAYER	1435	else if (op->type == PLAYER
1452	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR))	1436	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR))
…		…
1506	sl << uint8 (8) << uint8 (flags);	1490	sl << uint8 (8) << uint8 (flags);
1507	}	1491	}
1508	}	1492	}
1509		1493
1510	/* Floor face */	1494	/* Floor face */
1511	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1495	if (update_space (sl, socket, ms, lastcell, 2))
1512	mask \|= 0x4;	1496	mask \|= 0x4;
1513		1497
1514	if (socket.EMI_smooth)
1515	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1516	emask \|= 0x4;
1517
1518	/* Middle face */	1498	/* Middle face */
1519	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1499	if (update_space (sl, socket, ms, lastcell, 1))
1520	mask \|= 0x2;	1500	mask \|= 0x2;
1521		1501
1522	if (socket.EMI_smooth)	1502	if (ms.player () == pl
1523	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1503	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1524	emask \|= 0x2;
1525
1526	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1527	{	1504	{
		1505	// force player to be visible to himself if invisible
1528	if (lastcell.faces[0] != pl->face)	1506	if (lastcell.faces[0] != pl->face)
1529	{	1507	{
1530	lastcell.faces[0] = pl->face;	1508	lastcell.faces[0] = pl->face;
		1509
1531	mask \|= 0x1;	1510	mask \|= 0x1;
		1511	sl << uint16 (pl->face);
1532		1512
1533	socket.send_faces (pl);	1513	socket.send_faces (pl);
1534
1535	sl << uint16 (pl->face);
1536	}	1514	}
1537	}	1515	}
1538	else
1539	{
1540	/* Top face */	1516	/* Top face */
1541	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1517	else if (update_space (sl, socket, ms, lastcell, 0))
1542	mask \|= 0x1;	1518	mask \|= 0x1;
1543
1544	if (socket.EMI_smooth)
1545	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1546	emask \|= 0x1;
1547	}	1519
1548		1520
1549	/* Check to see if we are in fact sending anything for this	1521	/* Check to see if we are in fact sending anything for this
1550	* space by checking the mask. If so, update the mask.	1522	* space by checking the mask. If so, update the mask.
1551	* if not, reset the len to that from before adding the mask	1523	* if not, reset the len to that from before adding the mask
1552	* value, so we don't send those bits.	1524	* value, so we don't send those bits.
…		…
1554	if (mask & 0xf)	1526	if (mask & 0xf)
1555	sl[oldlen + 1] = mask & 0xff;	1527	sl[oldlen + 1] = mask & 0xff;
1556	else	1528	else
1557	sl.reset (oldlen);	1529	sl.reset (oldlen);
1558		1530
		1531	if (socket.ext_mapinfos)
		1532	esl << uint16 (emask);
		1533
		1534	if (socket.EMI_smooth)
		1535	{
		1536	for (int layer = 2+1; layer--; )
		1537	{
		1538	object *ob = ms.faces_obj [layer];
		1539
		1540	// If there is no object for this space, or if the face for the object
		1541	// is the blank face, set the smoothlevel to zero.
		1542	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1543
		1544	// We've gotten what face we want to use for the object. Now see if
		1545	// if it has changed since we last sent it to the client.
		1546	if (lastcell.smooth[layer] != smoothlevel)
		1547	{
		1548	lastcell.smooth[layer] = smoothlevel;
		1549	esl << uint8 (smoothlevel);
		1550	emask \|= 1 << layer;
		1551	}
		1552	}
		1553
1559	if (emask & 0xf)	1554	if (emask & 0xf)
1560	esl[eoldlen + 1] = emask & 0xff;	1555	esl[eoldlen + 1] = emask & 0xff;
1561	else	1556	else
1562	esl.reset (eoldlen);	1557	esl.reset (eoldlen);
		1558	}
1563	} /* else this is a viewable space */	1559	} /* else this is a viewable space */
1564	} /* for x loop */	1560	} /* for x loop */
1565	} /* for y loop */	1561	} /* for y loop */
1566		1562
1567	/* Verify that we in fact do need to send this */	1563	/* Verify that we in fact do need to send this */

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.74 by root, Wed Mar 14 01:19:10 2007 UTC vs. Revision 1.78 by root, Thu Mar 15 14:59:43 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.74 by root, Wed Mar 14 01:19:10 2007 UTC vs.
Revision 1.78 by root, Thu Mar 15 14:59:43 2007 UTC