[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.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		1012
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;	1013	int hx = socket.mapx / 2;
1117	int hy = socket.mapy / 2;	1014	int hy = socket.mapy / 2;
1118		1015
1119	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)
1120	{	1027	{
1121	sint16 nx, ny;	1028	/* space is out of map. Update space and clear values
1122	maptile *m = 0;	1029	* if this hasn't already been done. If the space is out
1123		1030	* of the map, it shouldn't have a head.
1124	for (int dy = -hy; dy <= hy; dy++)	1031	*/
		1032	if (lastcell.count != -1)
1125	{	1033	{
1126	// check to see if we can simply go one down quickly	1034	sl << uint16 (mask);
1127	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	{
1128	m = 0;	1085	mask \|= 0x8;
1129		1086
1130	// no, so do it the slow way	1087	*last_ext \|= 0x80;
1131	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)
1132	{	1106	{
1133	nx = ob->x + dx; ny = ob->y + dy; m = ob->map;	1107	if (op->stats.maxhp > op->stats.hp
1134		1108	&& op->stats.maxhp > 0
1135	if (xy_normalise (m, nx, ny))	1109	&& (op->type == PLAYER
1136	m->touch ();	1110	\|\| op->type == DOOR // does not work, have maxhp 0
1137	else	1111	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1112	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1113	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1138	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;
1139	}	1126	}
1140		1127
1141	int ax = dx + hx;	1128	if (expect_false (lastcell.stat_hp != stat_hp))
1142	int ay = dy + hy;
1143
1144	int emask, mask;
1145	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1146
1147	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1148
1149	/* If the coordinates are not valid, or it is too dark to see,
1150	* we tell the client as such
1151	*/
1152	if (!m)
1153	{	1129	{
1154	/* space is out of map. Update space and clear values	1130	lastcell.stat_hp = stat_hp;
1155	* if this hasn't already been done. If the space is out	1131
1156	* of the map, it shouldn't have a head.	1132	mask \|= 0x8;
1157	*/	1133	*last_ext \|= 0x80;
1158	if (lastcell.count != -1)	1134	last_ext = &sl[sl.length ()];
		1135
		1136	sl << uint8 (5) << uint8 (stat_hp);
		1137
		1138	if (stat_width > 1)
1159	{	1139	{
1160	sl << uint16 (mask);
1161	map_clearcell (&lastcell, -1);
1162	}
1163
1164	continue;
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	{
1224	mask \|= 0x8;
1225
1226	if (socket.extmap)
1227	{
1228	*last_ext \|= 0x80;	1140	*last_ext \|= 0x80;
1229	last_ext = &sl[sl.length ()];	1141	last_ext = &sl[sl.length ()];
1230	sl << uint8 (d);	1142
1231	}	1143	sl << uint8 (6) << uint8 (stat_width);
1232	else
1233	sl << uint8 (255 - 64 * d);
1234	}	1144	}
		1145	}
1235		1146
1236	lastcell.count = d;	1147	if (expect_false (lastcell.player != player))
1237
1238	mapspace &ms = m->at (nx, ny);
1239	ms.update ();
1240
1241	if (socket.extmap)
1242	{	1148	{
1243	uint8 stat_hp = 0;	1149	lastcell.player = player;
1244	uint8 stat_width = 0;
1245	uint8 flags = 0;
1246	tag_t player = 0;
1247		1150
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;	1151	mask \|= 0x8;
1278	*last_ext \|= 0x80;	1152	*last_ext \|= 0x80;
1279	last_ext = &sl[sl.length ()];	1153	last_ext = &sl[sl.length ()];
1280		1154
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);
1289	}
1290	}
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;	1155	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1301	}	1156	}
1302		1157
1303	if (lastcell.flags != flags)	1158	if (expect_false (lastcell.flags != flags))
1304	{	1159	{
1305	lastcell.flags = flags;	1160	lastcell.flags = flags;
1306		1161
1307	mask \|= 0x8;	1162	mask \|= 0x8;
1308	*last_ext \|= 0x80;	1163	*last_ext \|= 0x80;
1309	last_ext = &sl[sl.length ()];	1164	last_ext = &sl[sl.length ()];
1310		1165
1311	sl << uint8 (8) << uint8 (flags);	1166	sl << uint8 (8) << uint8 (flags);
1312	}
1313	}	1167	}
1314		1168
		1169	// faces
		1170
1315	/* Floor face */	1171	/* Floor face */
1316	if (update_space (sl, socket, ms, lastcell, 2))	1172	if (update_space (sl, socket, ms, lastcell, 2))
1317	mask \|= 0x4;	1173	mask \|= 0x4;
1318		1174
1319	/* Middle face */	1175	/* Middle face */
1320	if (update_space (sl, socket, ms, lastcell, 1))	1176	if (update_space (sl, socket, ms, lastcell, 1))
1321	mask \|= 0x2;	1177	mask \|= 0x2;
1322		1178
1323	if (ob->invisible	1179	if (expect_false (ob->invisible)
1324	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)	1180	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1325	&& ms.player () == ob)	1181	&& ms.player () == ob)
1326	{	1182	{
1327	// force player to be visible to himself if invisible	1183	// force player to be visible to himself if invisible
1328	if (lastcell.faces[0] != ob->face)	1184	if (lastcell.faces[0] != ob->face)
1329	{	1185	{
1330	lastcell.faces[0] = ob->face;	1186	lastcell.faces[0] = ob->face;
1331		1187
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;	1188	mask \|= 0x1;
		1189	sl << uint16 (ob->face);
1341		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
1342	/* 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
1343	* space by checking the mask. If so, update the mask.	1199	* space by checking the mask. If so, update the mask.
1344	* 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
1345	* value, so we don't send those bits.	1201	* value, so we don't send those bits.
1346	*/	1202	*/
1347	if (mask & 0xf)	1203	if (mask & 0xf)
1348	sl[oldlen + 1] = mask & 0xff;	1204	sl[oldlen + 1] = mask & 0xff;
1349	else	1205	else
1350	sl.reset (oldlen);	1206	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 */	1207	} /* else this is a viewable space */
1381	} /* for x loop */	1208	ordered_mapwalk_end
1382	} /* for y loop */
1383		1209
1384	socket.flush_fx ();	1210	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		1211
1402	if (sl.length () > startlen \|\| socket.sent_scroll)	1212	if (sl.length () > startlen \|\| socket.sent_scroll)
1403	{	1213	{
1404	socket.send_packet (sl);	1214	socket.send_packet (sl);
1405	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.143 by root, Tue Dec 23 06:58:24 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.143 by root, Tue Dec 23 06:58:24 2008 UTC vs.
Revision 1.150 by root, Mon Oct 12 14:00:59 2009 UTC