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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.136 by root, Sun Aug 10 16:31:18 2008 UTC vs.
Revision 1.145 by root, Fri Dec 26 10:44:17 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).
…		…
406	*/	402	*/
407	void	403	void
408	AddMeCmd (char buf, int len, client ns)	404	AddMeCmd (char buf, int len, client ns)
409	{	405	{
410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	406	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	}	407	}
465		408
466	/*	409	/*
467	#define MSG_TYPE_BOOK 1	410	#define MSG_TYPE_BOOK 1
468	#define MSG_TYPE_CARD 2	411	#define MSG_TYPE_CARD 2
…		…
833	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	776	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
834	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	777	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
835	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	778	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
836		779
837	for (int s = 0; s < NUM_SKILLS; s++)	780	for (int s = 0; s < NUM_SKILLS; s++)
838	if (object *skill = opl->last_skill_ob[s])	781	if (object *skill = opl->last_skill_ob [s])
839	if (skill->stats.exp != ns->last_skill_exp [s])	782	if (skill->stats.exp != ns->last_skill_exp [s])
840	{	783	{
841	ns->last_skill_exp [s] = skill->stats.exp;	784	ns->last_skill_exp [s] = skill->stats.exp;
842		785
843	/* Always send along the level if exp changes. This is only	786	/* Always send along the level if exp changes. This is only
…		…
912	<< uint32 (pl->ob->face)	855	<< uint32 (pl->ob->face)
913	<< data8 (pl->ob->name);	856	<< data8 (pl->ob->name);
914		857
915	pl->ns->last_weight = weight;	858	pl->ns->last_weight = weight;
916	pl->ns->send_packet (sl);	859	pl->ns->send_packet (sl);
917	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
918	}	860	}
919		861
920	/******************************************************************************	862	/******************************************************************************
921	*	863	*
922	* Start of map related commands.	864	* Start of map related commands.
…		…
989		931
990	/* Nothing changed */	932	/* Nothing changed */
991	return 0;	933	return 0;
992	}	934	}
993		935
994	/**
995	* Returns the size of a data for a map square as returned by
996	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
997	* available.
998	*/
999	int
1000	getExtendedMapInfoSize (client * ns)
1001	{
1002	int result = 0;
1003
1004	if (ns->ext_mapinfos)
1005	{
1006	if (ns->EMI_smooth)
1007	result += 1; /One byte for smoothlevel /
1008	}
1009
1010	return result;
1011	}
1012
1013	// prefetch (and touch) all maps within a specific distancd	936	// prefetch (and touch) all maps within a specific distancd
1014	static void	937	static void
1015	prefetch_surrounding_maps (maptile *map, int distance)	938	prefetch_surrounding_maps (maptile *map, int distance)
1016	{	939	{
1017	map->last_access = runtime;	940	map->last_access = runtime;
…		…
1040	{	963	{
1041	object *ob = pl->observe;	964	object *ob = pl->observe;
1042	if (!ob->active)	965	if (!ob->active)
1043	return;	966	return;
1044		967
1045	maptile *plmap = ob->map;
1046
1047	/* If player is just joining the game, he isn't here yet, so the map	968	/* If player is just joining the game, he isn't here yet, so the map
1048	* can get swapped out. If so, don't try to send them a map. All will	969	* can get swapped out. If so, don't try to send them a map. All will
1049	* be OK once they really log in.	970	* be OK once they really log in.
1050	*/	971	*/
1051	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)	972	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1052	return;	973	return;
1053		974
1054	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1055	int estartlen, eoldlen;	975	int startlen, oldlen;
1056	uint8 eentrysize;
1057	uint16 ewhatstart, ewhatflag;
1058	uint8 extendedinfos;
1059		976
1060	check_map_change (pl);	977	check_map_change (pl);
1061	prefetch_surrounding_maps (pl->ob);	978	prefetch_surrounding_maps (pl->ob);
1062		979
1063	/* do LOS after calls to update_position */	980	/* do LOS after calls to update_position */
1064	if (ob != pl->ob)	981	/* unfortunately, we need to udpate los when observing, currently */
1065	clear_los (pl);	982	if (pl->do_los \|\| pl->observe != pl->ob)
1066	else if (pl->do_los)
1067	{	983	{
1068	update_los (ob);
1069	pl->do_los = 0;	984	pl->do_los = 0;
		985	pl->update_los ();
1070	}	986	}
1071		987
1072	/**	988	/**
1073	* This function uses the new map1 protocol command to send the map	989	* This function uses the new map1 protocol command to send the map
1074	* to the client. It is necessary because the old map command supports	990	* to the client. It is necessary because the old map command supports
…		…
1093	*/	1009	*/
1094		1010
1095	client &socket = *pl->ns;	1011	client &socket = *pl->ns;
1096		1012
1097	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1013	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1098	packet esl;
1099		1014
1100	startlen = sl.length ();	1015	startlen = sl.length ();
1101		1016
1102	/Extendedmapinfo structure initialisation /	1017	int hx = socket.mapx / 2;
1103	if (socket.ext_mapinfos)	1018	int hy = socket.mapy / 2;
1104	{
1105	extendedinfos = EMI_NOREDRAW;
1106		1019
1107	if (socket.EMI_smooth)	1020	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1108	extendedinfos \|= EMI_SMOOTH;	1021	int ax = dx + hx;
		1022	int ay = dy + hy;
1109		1023
1110	ewhatstart = esl.length ();	1024	int mask = (ax << 10) \| (ay << 4);
1111	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1112	could need to be taken away */
1113	eentrysize = getExtendedMapInfoSize (&socket);
1114	esl << "mapextended "
1115	<< uint8 (extendedinfos)
1116	<< uint8 (eentrysize);
1117
1118	estartlen = esl.length ();
1119	}
1120
1121	/* x,y are the real map locations. ax, ay are viewport relative
1122	* locations.
1123	*/
1124	ay = 0;
1125
1126	/* We could do this logic as conditionals in the if statement,
1127	* but that started to get a bit messy to look at.
1128	*/
1129	max_x = ob->x + (socket.mapx + 1) / 2;
1130	max_y = ob->y + (socket.mapy + 1) / 2;
1131
1132	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1133	{
1134	sint16 nx, ny;
1135	maptile *m = 0;
1136
1137	ax = 0;
1138	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1139	{
1140	// check to see if we can simply go one right quickly
1141	++nx;
1142	if (m && nx >= m->width)
1143	m = 0;
1144
1145	if (!m)
1146	{
1147	nx = x; ny = y; m = plmap;
1148
1149	if (xy_normalise (m, nx, ny))
1150	m->touch ();
1151	else
1152	m = 0;
1153	}
1154
1155	int emask, mask;
1156	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1157
1158	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1025	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1159		1026
1160	/* If the coordinates are not valid, or it is too dark to see,	1027	/* If the coordinates are not valid, or it is too dark to see,
1161	* we tell the client as such	1028	* we tell the client as such
1162	*/	1029	*/
1163	if (!m)	1030	if (!m)
1164	{	1031	{
1165	/* space is out of map. Update space and clear values	1032	/* space is out of map. Update space and clear values
1166	* if this hasn't already been done. If the space is out	1033	* if this hasn't already been done. If the space is out
1167	* of the map, it shouldn't have a head	1034	* of the map, it shouldn't have a head.
1168	*/	1035	*/
1169	if (lastcell.count != -1)	1036	if (lastcell.count != -1)
		1037	{
		1038	sl << uint16 (mask);
		1039	map_clearcell (&lastcell, -1);
		1040	}
		1041
		1042	continue;
		1043	}
		1044
		1045	int d = pl->blocked_los_uc (dx, dy);
		1046
		1047	if (d > 3)
		1048	{
		1049	/* This block deals with spaces that are not visible for whatever
		1050	* reason. Still may need to send the head for this space.
		1051	*/
		1052	if (lastcell.count != -1
		1053	\|\| lastcell.faces[0]
		1054	\|\| lastcell.faces[1]
		1055	\|\| lastcell.faces[2]
		1056	\|\| lastcell.stat_hp
		1057	\|\| lastcell.flags
		1058	\|\| lastcell.player)
		1059	sl << uint16 (mask);
		1060
		1061	/* properly clear a previously sent big face */
		1062	map_clearcell (&lastcell, -1);
		1063	}
		1064	else
		1065	{
		1066	/* In this block, the space is visible.
		1067	*/
		1068
		1069	/* Rather than try to figure out what everything that we might
		1070	* need to send is, then form the packet after that,
		1071	* we presume that we will in fact form a packet, and update
		1072	* the bits by what we do actually send. If we send nothing,
		1073	* we just back out sl.length () to the old value, and no harm
		1074	* is done.
		1075	* I think this is simpler than doing a bunch of checks to see
		1076	* what if anything we need to send, setting the bits, then
		1077	* doing those checks again to add the real data.
		1078	*/
		1079	oldlen = sl.length ();
		1080
		1081	sl << uint16 (mask);
		1082
		1083	unsigned char dummy;
		1084	unsigned char *last_ext = &dummy;
		1085
		1086	/* Darkness changed */
		1087	if (lastcell.count != d && socket.darkness)
		1088	{
		1089	mask \|= 0x8;
		1090
		1091	if (socket.extmap)
		1092	{
		1093	*last_ext \|= 0x80;
		1094	last_ext = &sl[sl.length ()];
		1095	sl << uint8 (d);
		1096	}
		1097	else
		1098	sl << uint8 (255 - 64 * d);
		1099	}
		1100
		1101	lastcell.count = d;
		1102
		1103	mapspace &ms = m->at (nx, ny);
		1104	ms.update ();
		1105
		1106	if (expect_true (socket.extmap))
		1107	{
		1108	uint8 stat_hp = 0;
		1109	uint8 stat_width = 0;
		1110	uint8 flags = 0;
		1111	tag_t player = 0;
		1112
		1113	// send hp information, if applicable
		1114	if (object *op = ms.faces_obj [0])
		1115	if (op->is_head () && !op->invisible)
1170	{	1116	{
1171	sl << uint16 (mask);	1117	if (op->stats.maxhp > op->stats.hp
1172	map_clearcell (&lastcell, -1);	1118	&& op->stats.maxhp > 0
		1119	&& (op->type == PLAYER
		1120	\|\| op->type == DOOR // does not work, have maxhp 0
		1121	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1122	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1123	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
		1124	{
		1125	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1126	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1127	}
		1128
		1129	if (expect_false (op->has_dialogue ()))
		1130	flags \|= 1;
		1131
		1132	if (expect_false (op->type == PLAYER))
		1133	player = op == ob ? pl->ob->count
		1134	: op == pl->ob ? ob->count
		1135	: op->count;
1173	}	1136	}
1174		1137
1175	continue;	1138	if (expect_false (lastcell.stat_hp != stat_hp))
1176	}
1177
1178	int d = pl->blocked_los[ax][ay];
1179
1180	if (d > 3)
1181	{
1182	int need_send = 0, count;
1183
1184	/* This block deals with spaces that are not visible for whatever
1185	* reason. Still may need to send the head for this space.
1186	*/
1187
1188	oldlen = sl.length ();
1189
1190	sl << uint16 (mask);
1191
1192	if (lastcell.count != -1)
1193	need_send = 1;
1194
1195	count = -1;
1196
1197	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1198	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1199	need_send = 1;
1200
1201	/* properly clear a previously sent big face */
1202	map_clearcell (&lastcell, count);
1203
1204	if ((mask & 0xf) \|\| need_send)
1205	sl[oldlen + 1] = mask & 0xff;
1206	else
1207	sl.reset (oldlen);
1208	}
1209	else
1210	{
1211	/* In this block, the space is visible.
1212	*/
1213
1214	/* Rather than try to figure out what everything that we might
1215	* need to send is, then form the packet after that,
1216	* we presume that we will in fact form a packet, and update
1217	* the bits by what we do actually send. If we send nothing,
1218	* we just back out sl.length () to the old value, and no harm
1219	* is done.
1220	* I think this is simpler than doing a bunch of checks to see
1221	* what if anything we need to send, setting the bits, then
1222	* doing those checks again to add the real data.
1223	*/
1224	oldlen = sl.length ();
1225	eoldlen = esl.length ();
1226
1227	sl << uint16 (mask);
1228
1229	unsigned char dummy;
1230	unsigned char *last_ext = &dummy;
1231
1232	/* Darkness changed */
1233	if (lastcell.count != d && socket.darkness)
1234	{	1139	{
		1140	lastcell.stat_hp = stat_hp;
		1141
1235	mask \|= 0x8;	1142	mask \|= 0x8;
		1143	*last_ext \|= 0x80;
		1144	last_ext = &sl[sl.length ()];
1236		1145
1237	if (socket.extmap)	1146	sl << uint8 (5) << uint8 (stat_hp);
		1147
		1148	if (stat_width > 1)
1238	{	1149	{
1239	*last_ext \|= 0x80;	1150	*last_ext \|= 0x80;
1240	last_ext = &sl[sl.length ()];	1151	last_ext = &sl[sl.length ()];
1241	sl << uint8 (d);
1242	}
1243	else
1244	sl << uint8 (255 - 64 * d);
1245	}
1246		1152
1247	lastcell.count = d;
1248
1249	mapspace &ms = m->at (nx, ny);
1250	ms.update ();
1251
1252	if (socket.extmap)
1253	{
1254	uint8 stat_hp = 0;
1255	uint8 stat_width = 0;
1256	uint8 flags = 0;
1257	tag_t player = 0;
1258
1259	// send hp information, if applicable
1260	if (object *op = ms.faces_obj [0])
1261	if (op->is_head () && !op->invisible)
1262	{
1263	if (op->stats.maxhp > op->stats.hp
1264	&& op->stats.maxhp > 0
1265	&& (op->type == PLAYER
1266	\|\| op->type == DOOR // does not work, have maxhp 0
1267	\|\| QUERY_FLAG (op, FLAG_MONSTER)
1268	\|\| QUERY_FLAG (op, FLAG_ALIVE)
1269	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1270	{
1271	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1272	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1273	}
1274
1275	if (op->has_dialogue ())
1276	flags \|= 1;
1277
1278	if (op->type == PLAYER)
1279	player = op == ob ? pl->ob->count
1280	: op == pl->ob ? ob->count
1281	: op->count;
1282	}
1283
1284	if (lastcell.stat_hp != stat_hp)
1285	{
1286	lastcell.stat_hp = stat_hp;
1287
1288	mask \|= 0x8;
1289	*last_ext \|= 0x80;
1290	last_ext = &sl[sl.length ()];
1291
1292	sl << uint8 (5) << uint8 (stat_hp);
1293
1294	if (stat_width > 1)
1295	{
1296	*last_ext \|= 0x80;
1297	last_ext = &sl[sl.length ()];
1298
1299	sl << uint8 (6) << uint8 (stat_width);	1153	sl << uint8 (6) << uint8 (stat_width);
1300	}
1301	}	1154	}
1302
1303	if (lastcell.player != player)
1304	{
1305	lastcell.player = player;
1306
1307	mask \|= 0x8;
1308	*last_ext \|= 0x80;
1309	last_ext = &sl[sl.length ()];
1310
1311	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1312	}
1313
1314	if (lastcell.flags != flags)
1315	{
1316	lastcell.flags = flags;
1317
1318	mask \|= 0x8;
1319	*last_ext \|= 0x80;
1320	last_ext = &sl[sl.length ()];
1321
1322	sl << uint8 (8) << uint8 (flags);
1323	}
1324	}	1155	}
1325		1156
1326	/* Floor face */	1157	if (expect_false (lastcell.player != player))
1327	if (update_space (sl, socket, ms, lastcell, 2))	1158	{
		1159	lastcell.player = player;
		1160
1328	mask \|= 0x4;	1161	mask \|= 0x8;
		1162	*last_ext \|= 0x80;
		1163	last_ext = &sl[sl.length ()];
1329		1164
1330	/* Middle face */	1165	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1331	if (update_space (sl, socket, ms, lastcell, 1))	1166	}
		1167
		1168	if (expect_false (lastcell.flags != flags))
		1169	{
		1170	lastcell.flags = flags;
		1171
1332	mask \|= 0x2;	1172	mask \|= 0x8;
		1173	*last_ext \|= 0x80;
		1174	last_ext = &sl[sl.length ()];
1333		1175
1334	if (ms.player () == ob	1176	sl << uint8 (8) << uint8 (flags);
1335	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1336	{	1177	}
		1178	}
		1179
		1180	/* Floor face */
		1181	if (update_space (sl, socket, ms, lastcell, 2))
		1182	mask \|= 0x4;
		1183
		1184	/* Middle face */
		1185	if (update_space (sl, socket, ms, lastcell, 1))
		1186	mask \|= 0x2;
		1187
		1188	if (expect_false (ob->invisible)
		1189	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
		1190	&& ms.player () == ob)
		1191	{
1337	// force player to be visible to himself if invisible	1192	// force player to be visible to himself if invisible
1338	if (lastcell.faces[0] != ob->face)	1193	if (lastcell.faces[0] != ob->face)
1339	{	1194	{
1340	lastcell.faces[0] = ob->face;	1195	lastcell.faces[0] = ob->face;
1341		1196
1342	mask \|= 0x1;
1343	sl << uint16 (ob->face);
1344
1345	socket.send_faces (ob);
1346	}
1347	}
1348	/* Top face */
1349	else if (update_space (sl, socket, ms, lastcell, 0))
1350	mask \|= 0x1;	1197	mask \|= 0x1;
		1198	sl << uint16 (ob->face);
1351		1199
		1200	socket.send_faces (ob);
		1201	}
		1202	}
		1203	/* Top face */
		1204	else if (update_space (sl, socket, ms, lastcell, 0))
		1205	mask \|= 0x1;
		1206
1352	/* Check to see if we are in fact sending anything for this	1207	/* Check to see if we are in fact sending anything for this
1353	* space by checking the mask. If so, update the mask.	1208	* space by checking the mask. If so, update the mask.
1354	* if not, reset the len to that from before adding the mask	1209	* if not, reset the len to that from before adding the mask
1355	* value, so we don't send those bits.	1210	* value, so we don't send those bits.
1356	*/	1211	*/
1357	if (mask & 0xf)	1212	if (mask & 0xf)
1358	sl[oldlen + 1] = mask & 0xff;	1213	sl[oldlen + 1] = mask & 0xff;
1359	else	1214	else
1360	sl.reset (oldlen);	1215	sl.reset (oldlen);
1361
1362	if (socket.ext_mapinfos)
1363	esl << uint16 (emask);
1364
1365	if (socket.EMI_smooth)
1366	{
1367	for (int layer = 2+1; layer--; )
1368	{
1369	object *ob = ms.faces_obj [layer];
1370
1371	// If there is no object for this space, or if the face for the object
1372	// is the blank face, set the smoothlevel to zero.
1373	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1374
1375	// We've gotten what face we want to use for the object. Now see if
1376	// if it has changed since we last sent it to the client.
1377	if (lastcell.smooth[layer] != smoothlevel)
1378	{
1379	lastcell.smooth[layer] = smoothlevel;
1380	esl << uint8 (smoothlevel);
1381	emask \|= 1 << layer;
1382	}
1383	}
1384
1385	if (emask & 0xf)
1386	esl[eoldlen + 1] = emask & 0xff;
1387	else
1388	esl.reset (eoldlen);
1389	}
1390	} /* else this is a viewable space */	1216	} /* else this is a viewable space */
1391	} /* for x loop */	1217	ordered_mapwalk_end
1392	} /* for y loop */
1393		1218
1394	socket.flush_fx ();	1219	socket.flush_fx ();
1395
1396	/* Verify that we in fact do need to send this */
1397	if (socket.ext_mapinfos)
1398	{
1399	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1400	{
1401	/* No map data will follow, so don't say the client
1402	* it doesn't need draw!
1403	*/
1404	ewhatflag &= ~EMI_NOREDRAW;
1405	esl[ewhatstart + 1] = ewhatflag & 0xff;
1406	}
1407
1408	if (esl.length () > estartlen)
1409	socket.send_packet (esl);
1410	}
1411		1220
1412	if (sl.length () > startlen \|\| socket.sent_scroll)	1221	if (sl.length () > startlen \|\| socket.sent_scroll)
1413	{	1222	{
1414	socket.send_packet (sl);	1223	socket.send_packet (sl);
1415	socket.sent_scroll = 0;	1224	socket.sent_scroll = 0;
…		…
1436	{	1245	{
1437	packet sl;	1246	packet sl;
1438	sl << "replyinfo skill_info\n";	1247	sl << "replyinfo skill_info\n";
1439		1248
1440	for (int i = 1; i < NUM_SKILLS; i++)	1249	for (int i = 1; i < NUM_SKILLS; i++)
1441	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1250	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1442		1251
1443	if (sl.length () > MAXSOCKBUF)	1252	if (sl.length () > MAXSOCKBUF)
1444	{	1253	{
1445	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1254	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1446	fatal (0);	1255	fatal (0);
…		…
1564	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1373	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1565	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1374	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1566		1375
1567	/* figure out which skill it uses, if it uses one */	1376	/* figure out which skill it uses, if it uses one */
1568	if (spell->skill)	1377	if (spell->skill)
1569	{	1378	if (object *tmp = pl->find_skill (spell->skill))
1570	for (i = 1; i < NUM_SKILLS; i++)
1571	if (!strcmp (spell->skill, skill_names[i]))
1572	{
1573	skill = i + CS_STAT_SKILLINFO;	1379	skill = tmp->subtype + CS_STAT_SKILLINFO;
1574	break;
1575	}
1576	}
1577		1380
1578	// spells better have a face	1381	// spells better have a face
1579	if (!spell->face)	1382	if (!spell->face)
1580	{	1383	{
1581	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1384	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.136 by root, Sun Aug 10 16:31:18 2008 UTC vs. Revision 1.145 by root, Fri Dec 26 10:44:17 2008 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.136 by root, Sun Aug 10 16:31:18 2008 UTC vs.
Revision 1.145 by root, Fri Dec 26 10:44:17 2008 UTC