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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.144 by root, Fri Dec 26 10:36:42 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	/**
…		…
208	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)
209	{	210	{
210	int dx = ob->x - socket.current_x;	211	int dx = ob->x - socket.current_x;
211	int dy = ob->y - socket.current_y;	212	int dy = ob->y - socket.current_y;
212		213
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);	214	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218	socket.floorbox_reset ();	215	socket.floorbox_reset ();
219	}
220	}	216	}
221		217
222	socket.current_x = ob->x;	218	socket.current_x = ob->x;
223	socket.current_y = ob->y;	219	socket.current_y = ob->y;
224	}	220	}
…		…
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 */
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
462	/*	405	/*
463	#define MSG_TYPE_BOOK 1	406	#define MSG_TYPE_BOOK 1
464	#define MSG_TYPE_CARD 2	407	#define MSG_TYPE_CARD 2
465	#define MSG_TYPE_PAPER 3	408	#define MSG_TYPE_PAPER 3
466	#define MSG_TYPE_SIGN 4	409	#define MSG_TYPE_SIGN 4
…		…
743	* Get player's current range attack in obuf.	686	* Get player's current range attack in obuf.
744	*/	687	*/
745	static void	688	static void
746	rangetostring (player pl, char obuf)	689	rangetostring (player pl, char obuf)
747	{	690	{
748	dynbuf_text buf;	691	dynbuf_text &buf = msg_dynbuf; buf.clear ();
749		692
750	if (pl->ranged_ob)	693	if (pl->ranged_ob)
751	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;
752		695
753	if (pl->combat_ob)	696	if (pl->combat_ob)
…		…
984		927
985	/* Nothing changed */	928	/* Nothing changed */
986	return 0;	929	return 0;
987	}	930	}
988		931
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	932	// prefetch (and touch) all maps within a specific distancd
1009	static void	933	static void
1010	prefetch_surrounding_maps (maptile *map, int distance)	934	prefetch_surrounding_maps (maptile *map, int distance)
1011	{	935	{
1012	map->last_access = runtime;	936	map->touch ();
1013		937
1014	if (--distance)	938	if (--distance)
1015	for (int dir = 4; --dir; )	939	for (int dir = 4; --dir; )
1016	if (const shstr &path = map->tile_path [dir])	940	if (const shstr &path = map->tile_path [dir])
1017	if (maptile *&neigh = map->tile_map [dir])	941	if (maptile *&neigh = map->tile_map [dir])
…		…
1043	*/	967	*/
1044	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	968	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1045	return;	969	return;
1046		970
1047	int startlen, oldlen;	971	int startlen, oldlen;
1048	int estartlen, eoldlen;
1049	uint8 eentrysize;
1050	uint16 ewhatstart, ewhatflag;
1051	uint8 extendedinfos;
1052		972
1053	check_map_change (pl);	973	check_map_change (pl);
1054	prefetch_surrounding_maps (pl->ob);	974	prefetch_surrounding_maps (pl->ob);
1055		975
1056	/* do LOS after calls to update_position */	976	/* do LOS after calls to update_position */
…		…
1085	*/	1005	*/
1086		1006
1087	client &socket = *pl->ns;	1007	client &socket = *pl->ns;
1088		1008
1089	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1009	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1090	packet esl;
1091		1010
1092	startlen = sl.length ();	1011	startlen = sl.length ();
1093
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		1012
1113	int hx = socket.mapx / 2;	1013	int hx = socket.mapx / 2;
1114	int hy = socket.mapy / 2;	1014	int hy = socket.mapy / 2;
1115		1015
1116	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)	1016	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1117	int ax = dx + hx;	1017	int ax = dx + hx;
1118	int ay = dy + hy;	1018	int ay = dy + hy;
1119		1019
1120	int emask, mask;
1121	emask = mask = (ax << 10) \| (ay << 4);	1020	int mask = (ax << 10) \| (ay << 4);
1122
1123	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1021	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1124		1022
1125	/* If the coordinates are not valid, or it is too dark to see,	1023	/* If the coordinates are not valid, or it is too dark to see,
1126	* we tell the client as such	1024	* we tell the client as such
1127	*/	1025	*/
…		…
1173	* I think this is simpler than doing a bunch of checks to see	1071	* I think this is simpler than doing a bunch of checks to see
1174	* what if anything we need to send, setting the bits, then	1072	* what if anything we need to send, setting the bits, then
1175	* doing those checks again to add the real data.	1073	* doing those checks again to add the real data.
1176	*/	1074	*/
1177	oldlen = sl.length ();	1075	oldlen = sl.length ();
1178	eoldlen = esl.length ();
1179		1076
1180	sl << uint16 (mask);	1077	sl << uint16 (mask);
1181		1078
1182	unsigned char dummy;	1079	unsigned char dummy;
1183	unsigned char *last_ext = &dummy;	1080	unsigned char *last_ext = &dummy;
1184		1081
1185	/* Darkness changed */	1082	/* Darkness changed */
1186	if (lastcell.count != d && socket.darkness)	1083	if (lastcell.count != d)
1187	{	1084	{
1188	mask \|= 0x8;	1085	mask \|= 0x8;
1189		1086
1190	if (socket.extmap)	1087	*last_ext \|= 0x80;
		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)
		1106	{
		1107	if (op->stats.maxhp > op->stats.hp
		1108	&& op->stats.maxhp > 0
		1109	&& (op->type == PLAYER
		1110	\|\| op->type == DOOR // does not work, have maxhp 0
		1111	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1112	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1113	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
		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;
		1126	}
		1127
		1128	if (expect_false (lastcell.stat_hp != stat_hp))
		1129	{
		1130	lastcell.stat_hp = stat_hp;
		1131
		1132	mask \|= 0x8;
		1133	*last_ext \|= 0x80;
		1134	last_ext = &sl[sl.length ()];
		1135
		1136	sl << uint8 (5) << uint8 (stat_hp);
		1137
		1138	if (stat_width > 1)
1191	{	1139	{
1192	*last_ext \|= 0x80;	1140	*last_ext \|= 0x80;
1193	last_ext = &sl[sl.length ()];	1141	last_ext = &sl[sl.length ()];
1194	sl << uint8 (d);
1195	}
1196	else
1197	sl << uint8 (255 - 64 * d);
1198	}
1199		1142
1200	lastcell.count = d;
1201
1202	mapspace &ms = m->at (nx, ny);
1203	ms.update ();
1204
1205	if (expect_true (socket.extmap))
1206	{
1207	uint8 stat_hp = 0;
1208	uint8 stat_width = 0;
1209	uint8 flags = 0;
1210	tag_t player = 0;
1211
1212	// send hp information, if applicable
1213	if (object *op = ms.faces_obj [0])
1214	if (op->is_head () && !op->invisible)
1215	{
1216	if (op->stats.maxhp > op->stats.hp
1217	&& op->stats.maxhp > 0
1218	&& (op->type == PLAYER
1219	\|\| op->type == DOOR // does not work, have maxhp 0
1220	\|\| QUERY_FLAG (op, FLAG_MONSTER)
1221	\|\| QUERY_FLAG (op, FLAG_ALIVE)
1222	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1223	{
1224	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1225	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1226	}
1227
1228	if (expect_false (op->has_dialogue ()))
1229	flags \|= 1;
1230
1231	if (expect_false (op->type == PLAYER))
1232	player = op == ob ? pl->ob->count
1233	: op == pl->ob ? ob->count
1234	: op->count;
1235	}
1236
1237	if (expect_false (lastcell.stat_hp != stat_hp))
1238	{
1239	lastcell.stat_hp = stat_hp;
1240
1241	mask \|= 0x8;
1242	*last_ext \|= 0x80;
1243	last_ext = &sl[sl.length ()];
1244
1245	sl << uint8 (5) << uint8 (stat_hp);
1246
1247	if (stat_width > 1)
1248	{
1249	*last_ext \|= 0x80;
1250	last_ext = &sl[sl.length ()];
1251
1252	sl << uint8 (6) << uint8 (stat_width);	1143	sl << uint8 (6) << uint8 (stat_width);
1253	}
1254	}
1255
1256	if (expect_false (lastcell.player != player))
1257	{
1258	lastcell.player = player;
1259
1260	mask \|= 0x8;
1261	*last_ext \|= 0x80;
1262	last_ext = &sl[sl.length ()];
1263
1264	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1265	}
1266
1267	if (expect_false (lastcell.flags != flags))
1268	{
1269	lastcell.flags = flags;
1270
1271	mask \|= 0x8;
1272	*last_ext \|= 0x80;
1273	last_ext = &sl[sl.length ()];
1274
1275	sl << uint8 (8) << uint8 (flags);
1276	}	1144	}
1277	}	1145	}
		1146
		1147	if (expect_false (lastcell.player != player))
		1148	{
		1149	lastcell.player = player;
		1150
		1151	mask \|= 0x8;
		1152	*last_ext \|= 0x80;
		1153	last_ext = &sl[sl.length ()];
		1154
		1155	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
		1156	}
		1157
		1158	if (expect_false (lastcell.flags != flags))
		1159	{
		1160	lastcell.flags = flags;
		1161
		1162	mask \|= 0x8;
		1163	*last_ext \|= 0x80;
		1164	last_ext = &sl[sl.length ()];
		1165
		1166	sl << uint8 (8) << uint8 (flags);
		1167	}
		1168
		1169	// faces
1278		1170
1279	/* Floor face */	1171	/* Floor face */
1280	if (update_space (sl, socket, ms, lastcell, 2))	1172	if (update_space (sl, socket, ms, lastcell, 2))
1281	mask \|= 0x4;	1173	mask \|= 0x4;
1282		1174
…		…
1310	*/	1202	*/
1311	if (mask & 0xf)	1203	if (mask & 0xf)
1312	sl[oldlen + 1] = mask & 0xff;	1204	sl[oldlen + 1] = mask & 0xff;
1313	else	1205	else
1314	sl.reset (oldlen);	1206	sl.reset (oldlen);
1315
1316	if (socket.ext_mapinfos)
1317	esl << uint16 (emask);
1318
1319	if (socket.EMI_smooth)
1320	{
1321	for (int layer = 2+1; layer--; )
1322	{
1323	object *ob = ms.faces_obj [layer];
1324
1325	// If there is no object for this space, or if the face for the object
1326	// is the blank face, set the smoothlevel to zero.
1327	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1328
1329	// We've gotten what face we want to use for the object. Now see if
1330	// if it has changed since we last sent it to the client.
1331	if (lastcell.smooth[layer] != smoothlevel)
1332	{
1333	lastcell.smooth[layer] = smoothlevel;
1334	esl << uint8 (smoothlevel);
1335	emask \|= 1 << layer;
1336	}
1337	}
1338
1339	if (emask & 0xf)
1340	esl[eoldlen + 1] = emask & 0xff;
1341	else
1342	esl.reset (eoldlen);
1343	}
1344	} /* else this is a viewable space */	1207	} /* else this is a viewable space */
1345	ordered_mapwalk_end	1208	ordered_mapwalk_end
1346		1209
1347	socket.flush_fx ();	1210	socket.flush_fx ();
1348
1349	/* Verify that we in fact do need to send this */
1350	if (socket.ext_mapinfos)
1351	{
1352	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1353	{
1354	/* No map data will follow, so don't say the client
1355	* it doesn't need draw!
1356	*/
1357	ewhatflag &= ~EMI_NOREDRAW;
1358	esl[ewhatstart + 1] = ewhatflag & 0xff;
1359	}
1360
1361	if (esl.length () > estartlen)
1362	socket.send_packet (esl);
1363	}
1364		1211
1365	if (sl.length () > startlen \|\| socket.sent_scroll)	1212	if (sl.length () > startlen \|\| socket.sent_scroll)
1366	{	1213	{
1367	socket.send_packet (sl);	1214	socket.send_packet (sl);
1368	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.144 by root, Fri Dec 26 10:36:42 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.144 by root, Fri Dec 26 10:36:42 2008 UTC vs.
Revision 1.150 by root, Mon Oct 12 14:00:59 2009 UTC