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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.129 by root, Tue May 6 19:37:01 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).
…		…
141	pl->ns->send_packet ("newmap");	137	pl->ns->send_packet ("newmap");
142		138
143	pl->ns->floorbox_reset ();	139	pl->ns->floorbox_reset ();
144	}	140	}
145		141
		142	static void
		143	send_map_info (player *pl)
		144	{
		145	client &socket = *pl->ns;
		146	object *ob = pl->observe;
		147
		148	if (socket.mapinfocmd)
		149	{
		150	if (ob->map && ob->map->path[0])
		151	{
		152	int flags = 0;
		153
		154	if (ob->map->tile_path[0]) flags \|= 1;
		155	if (ob->map->tile_path[1]) flags \|= 2;
		156	if (ob->map->tile_path[2]) flags \|= 4;
		157	if (ob->map->tile_path[3]) flags \|= 8;
		158
		159	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		160	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		161	ob->map->width, ob->map->height, &ob->map->path);
		162	}
		163	else
		164	socket.send_packet ("mapinfo current");
		165	}
		166	}
		167
146	/** check for map/region change and send new map data */	168	/** check for map/region change and send new map data */
147	static void	169	static void
148	check_map_change (player *pl)	170	check_map_change (player *pl)
149	{	171	{
150	client &socket = *pl->ns;	172	client &socket = *pl->ns;
151	object *ob = pl->observe;	173	object *ob = pl->observe;
152		174
		175	region *reg = ob->region ();
		176	if (socket.current_region != reg)
		177	{
		178	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		179	socket.current_region = reg;
		180	}
		181
		182	// first try to aovid a full newmap on tiled map scrolls
		183	if (socket.current_map != ob->map && !socket.force_newmap)
		184	{
		185	rv_vector rv;
		186
		187	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		188
		189	// manhattan distance is very handy here
		190	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		191	{
		192	socket.current_map = ob->map;
		193	socket.current_x = ob->x;
		194	socket.current_y = ob->y;
		195
		196	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		197	socket.floorbox_reset ();
		198	send_map_info (pl);
		199	}
		200	}
		201
153	if (socket.current_map != ob->map \|\| socket.force_newmap)	202	if (socket.current_map != ob->map \|\| socket.force_newmap)
154	{	203	{
155	clear_map (pl);	204	clear_map (pl);
156	socket.current_map = ob->map;	205	socket.current_map = ob->map;
157		206	send_map_info (pl);
158	if (socket.mapinfocmd)
159	{
160	if (ob->map && ob->map->path[0])
161	{
162	int flags = 0;
163
164	if (ob->map->tile_path[0]) flags \|= 1;
165	if (ob->map->tile_path[1]) flags \|= 2;
166	if (ob->map->tile_path[2]) flags \|= 4;
167	if (ob->map->tile_path[3]) flags \|= 8;
168
169	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
170	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171	ob->map->width, ob->map->height, &ob->map->path);
172	}
173	else
174	socket.send_packet ("mapinfo current");
175	}
176	}	207	}
177	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)
178	{	209	{
179	int dx = ob->x - socket.current_x;	210	int dx = ob->x - socket.current_x;
180	int dy = ob->y - socket.current_y;	211	int dy = ob->y - socket.current_y;
…		…
188	}	219	}
189	}	220	}
190		221
191	socket.current_x = ob->x;	222	socket.current_x = ob->x;
192	socket.current_y = ob->y;	223	socket.current_y = ob->y;
193
194	region *reg = ob->region ();
195	if (socket.current_region != reg)
196	{
197	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
198	socket.current_region = reg;
199	}
200	}	224	}
201		225
202	/**	226	/**
203	* RequestInfo is sort of a meta command. There is some specific	227	* RequestInfo is sort of a meta command. There is some specific
204	* request of information, but we call other functions to provide	228	* request of information, but we call other functions to provide
…		…
378	*/	402	*/
379	void	403	void
380	AddMeCmd (char buf, int len, client ns)	404	AddMeCmd (char buf, int len, client ns)
381	{	405	{
382	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	406	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383	}
384
385	/** Reply to ExtendedInfos command */
386	void
387	ToggleExtendedInfos (char buf, int len, client ns)
388	{
389	char cmdback[MAX_BUF];
390	char command[50];
391	int info, nextinfo;
392
393	cmdback[0] = '\0';
394	nextinfo = 0;
395
396	while (1)
397	{
398	/* 1. Extract an info */
399	info = nextinfo;
400
401	while ((info < len) && (buf[info] == ' '))
402	info++;
403
404	if (info >= len)
405	break;
406
407	nextinfo = info + 1;
408
409	while ((nextinfo < len) && (buf[nextinfo] != ' '))
410	nextinfo++;
411
412	if (nextinfo - info >= 49) /Erroneous info asked /
413	continue;
414
415	strncpy (command, &(buf[info]), nextinfo - info);
416
417	/* 2. Interpret info */
418	if (!strcmp ("smooth", command))
419	/* Toggle smoothing */
420	ns->EMI_smooth = !ns->EMI_smooth;
421	else
422	/bad value /;
423
424	/3. Next info /
425	}
426
427	strcpy (cmdback, "ExtendedInfoSet");
428
429	if (ns->EMI_smooth)
430	{
431	strcat (cmdback, " ");
432	strcat (cmdback, "smoothing");
433	}
434
435	ns->send_packet (cmdback);
436	}	407	}
437		408
438	/*	409	/*
439	#define MSG_TYPE_BOOK 1	410	#define MSG_TYPE_BOOK 1
440	#define MSG_TYPE_CARD 2	411	#define MSG_TYPE_CARD 2
…		…
805	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	776	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
806	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	777	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
807	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	778	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
808		779
809	for (int s = 0; s < NUM_SKILLS; s++)	780	for (int s = 0; s < NUM_SKILLS; s++)
810	if (object *skill = opl->last_skill_ob[s])	781	if (object *skill = opl->last_skill_ob [s])
811	if (skill->stats.exp != ns->last_skill_exp [s])	782	if (skill->stats.exp != ns->last_skill_exp [s])
812	{	783	{
813	ns->last_skill_exp [s] = skill->stats.exp;	784	ns->last_skill_exp [s] = skill->stats.exp;
814		785
815	/* Always send along the level if exp changes. This is only	786	/* Always send along the level if exp changes. This is only
…		…
884	<< uint32 (pl->ob->face)	855	<< uint32 (pl->ob->face)
885	<< data8 (pl->ob->name);	856	<< data8 (pl->ob->name);
886		857
887	pl->ns->last_weight = weight;	858	pl->ns->last_weight = weight;
888	pl->ns->send_packet (sl);	859	pl->ns->send_packet (sl);
889	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
890	}	860	}
891		861
892	/******************************************************************************	862	/******************************************************************************
893	*	863	*
894	* Start of map related commands.	864	* Start of map related commands.
…		…
961		931
962	/* Nothing changed */	932	/* Nothing changed */
963	return 0;	933	return 0;
964	}	934	}
965		935
966	/**
967	* Returns the size of a data for a map square as returned by
968	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
969	* available.
970	*/
971	int
972	getExtendedMapInfoSize (client * ns)
973	{
974	int result = 0;
975
976	if (ns->ext_mapinfos)
977	{
978	if (ns->EMI_smooth)
979	result += 1; /One byte for smoothlevel /
980	}
981
982	return result;
983	}
984
985	// prefetch (and touch) all maps within a specific distancd	936	// prefetch (and touch) all maps within a specific distancd
986	static void	937	static void
987	prefetch_surrounding_maps (maptile *map, int distance)	938	prefetch_surrounding_maps (maptile *map, int distance)
988	{	939	{
989	map->last_access = runtime;	940	map->last_access = runtime;
…		…
1012	{	963	{
1013	object *ob = pl->observe;	964	object *ob = pl->observe;
1014	if (!ob->active)	965	if (!ob->active)
1015	return;	966	return;
1016		967
1017	maptile *plmap = ob->map;
1018
1019	/* 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
1020	* 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
1021	* be OK once they really log in.	970	* be OK once they really log in.
1022	*/	971	*/
1023	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)	972	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1024	return;	973	return;
1025		974
1026	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1027	int estartlen, eoldlen;	975	int startlen, oldlen;
1028	uint8 eentrysize;
1029	uint16 ewhatstart, ewhatflag;
1030	uint8 extendedinfos;
1031		976
1032	check_map_change (pl);	977	check_map_change (pl);
1033	prefetch_surrounding_maps (pl->ob);	978	prefetch_surrounding_maps (pl->ob);
1034		979
1035	/* do LOS after calls to update_position */	980	/* do LOS after calls to update_position */
1036	if (ob != pl->ob)	981	/* unfortunately, we need to udpate los when observing, currently */
1037	clear_los (pl);	982	if (pl->do_los \|\| pl->observe != pl->ob)
1038	else if (pl->do_los)
1039	{	983	{
1040	update_los (ob);
1041	pl->do_los = 0;	984	pl->do_los = 0;
		985	pl->update_los ();
1042	}	986	}
1043		987
1044	/**	988	/**
1045	* 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
1046	* 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
…		…
1065	*/	1009	*/
1066		1010
1067	client &socket = *pl->ns;	1011	client &socket = *pl->ns;
1068		1012
1069	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1013	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1070	packet esl;
1071		1014
1072	startlen = sl.length ();	1015	startlen = sl.length ();
1073		1016
1074	/Extendedmapinfo structure initialisation /	1017	int hx = socket.mapx / 2;
1075	if (socket.ext_mapinfos)	1018	int hy = socket.mapy / 2;
1076	{
1077	extendedinfos = EMI_NOREDRAW;
1078		1019
1079	if (socket.EMI_smooth)	1020	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1080	extendedinfos \|= EMI_SMOOTH;	1021	int ax = dx + hx;
		1022	int ay = dy + hy;
1081		1023
1082	ewhatstart = esl.length ();	1024	int mask = (ax << 10) \| (ay << 4);
1083	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1084	could need to be taken away */
1085	eentrysize = getExtendedMapInfoSize (&socket);
1086	esl << "mapextended "
1087	<< uint8 (extendedinfos)
1088	<< uint8 (eentrysize);
1089
1090	estartlen = esl.length ();
1091	}
1092
1093	/* x,y are the real map locations. ax, ay are viewport relative
1094	* locations.
1095	*/
1096	ay = 0;
1097
1098	/* We could do this logic as conditionals in the if statement,
1099	* but that started to get a bit messy to look at.
1100	*/
1101	max_x = ob->x + (socket.mapx + 1) / 2;
1102	max_y = ob->y + (socket.mapy + 1) / 2;
1103
1104	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1105	{
1106	sint16 nx, ny;
1107	maptile *m = 0;
1108
1109	ax = 0;
1110	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1111	{
1112	// check to see if we can simply go one right quickly
1113	++nx;
1114	if (m && nx >= m->width)
1115	m = 0;
1116
1117	if (!m)
1118	{
1119	nx = x; ny = y; m = plmap;
1120
1121	if (xy_normalise (m, nx, ny))
1122	m->touch ();
1123	else
1124	m = 0;
1125	}
1126
1127	int emask, mask;
1128	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1129
1130	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1025	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1131		1026
1132	/* 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,
1133	* we tell the client as such	1028	* we tell the client as such
1134	*/	1029	*/
1135	if (!m)	1030	if (!m)
1136	{	1031	{
1137	/* space is out of map. Update space and clear values	1032	/* space is out of map. Update space and clear values
1138	* 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
1139	* of the map, it shouldn't have a head	1034	* of the map, it shouldn't have a head.
1140	*/	1035	*/
1141	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)
1142	{	1116	{
1143	sl << uint16 (mask);	1117	if (op->stats.maxhp > op->stats.hp
1144	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;
1145	}	1136	}
1146		1137
1147	continue;	1138	if (expect_false (lastcell.stat_hp != stat_hp))
1148	}
1149
1150	int d = pl->blocked_los[ax][ay];
1151
1152	if (d > 3)
1153	{
1154
1155	int need_send = 0, count;
1156
1157	/* This block deals with spaces that are not visible for whatever
1158	* reason. Still may need to send the head for this space.
1159	*/
1160
1161	oldlen = sl.length ();
1162
1163	sl << uint16 (mask);
1164
1165	if (lastcell.count != -1)
1166	need_send = 1;
1167
1168	count = -1;
1169
1170	/* properly clear a previously sent big face */
1171	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1172	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1173	need_send = 1;
1174
1175	map_clearcell (&lastcell, count);
1176
1177	if ((mask & 0xf) \|\| need_send)
1178	sl[oldlen + 1] = mask & 0xff;
1179	else
1180	sl.reset (oldlen);
1181	}
1182	else
1183	{
1184	/* In this block, the space is visible.
1185	*/
1186
1187	/* Rather than try to figure out what everything that we might
1188	* need to send is, then form the packet after that,
1189	* we presume that we will in fact form a packet, and update
1190	* the bits by what we do actually send. If we send nothing,
1191	* we just back out sl.length () to the old value, and no harm
1192	* is done.
1193	* I think this is simpler than doing a bunch of checks to see
1194	* what if anything we need to send, setting the bits, then
1195	* doing those checks again to add the real data.
1196	*/
1197	oldlen = sl.length ();
1198	eoldlen = esl.length ();
1199
1200	sl << uint16 (mask);
1201
1202	unsigned char dummy;
1203	unsigned char *last_ext = &dummy;
1204
1205	/* Darkness changed */
1206	if (lastcell.count != d && socket.darkness)
1207	{	1139	{
		1140	lastcell.stat_hp = stat_hp;
		1141
1208	mask \|= 0x8;	1142	mask \|= 0x8;
		1143	*last_ext \|= 0x80;
		1144	last_ext = &sl[sl.length ()];
1209		1145
1210	if (socket.extmap)	1146	sl << uint8 (5) << uint8 (stat_hp);
		1147
		1148	if (stat_width > 1)
1211	{	1149	{
1212	*last_ext \|= 0x80;	1150	*last_ext \|= 0x80;
1213	last_ext = &sl[sl.length ()];	1151	last_ext = &sl[sl.length ()];
1214	sl << uint8 (d);
1215	}
1216	else
1217	sl << uint8 (255 - 64 * d);
1218	}
1219		1152
1220	lastcell.count = d;
1221
1222	mapspace &ms = m->at (nx, ny);
1223	ms.update ();
1224
1225	if (socket.extmap)
1226	{
1227	uint8 stat_hp = 0;
1228	uint8 stat_width = 0;
1229	uint8 flags = 0;
1230	tag_t player = 0;
1231
1232	// send hp information, if applicable
1233	if (object *op = ms.faces_obj [0])
1234	if (op->is_head () && !op->invisible)
1235	{
1236	if (op->stats.maxhp > op->stats.hp
1237	&& op->stats.maxhp > 0
1238	&& (op->type == PLAYER
1239	\|\| op->type == DOOR // does not work, have maxhp 0
1240	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1241	{
1242	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1243	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1244	}
1245
1246	if (op->msg && op->msg[0] == '@')
1247	flags \|= 1;
1248
1249	if (op->type == PLAYER && op != ob)
1250	player = op->count;
1251	}
1252
1253	if (lastcell.stat_hp != stat_hp)
1254	{
1255	lastcell.stat_hp = stat_hp;
1256
1257	mask \|= 0x8;
1258	*last_ext \|= 0x80;
1259	last_ext = &sl[sl.length ()];
1260
1261	sl << uint8 (5) << uint8 (stat_hp);
1262
1263	if (stat_width > 1)
1264	{
1265	*last_ext \|= 0x80;
1266	last_ext = &sl[sl.length ()];
1267
1268	sl << uint8 (6) << uint8 (stat_width);	1153	sl << uint8 (6) << uint8 (stat_width);
1269	}
1270	}	1154	}
1271
1272	if (lastcell.player != player)
1273	{
1274	lastcell.player = player;
1275
1276	mask \|= 0x8;
1277	*last_ext \|= 0x80;
1278	last_ext = &sl[sl.length ()];
1279
1280	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1281	}
1282
1283	if (lastcell.flags != flags)
1284	{
1285	lastcell.flags = flags;
1286
1287	mask \|= 0x8;
1288	*last_ext \|= 0x80;
1289	last_ext = &sl[sl.length ()];
1290
1291	sl << uint8 (8) << uint8 (flags);
1292	}
1293	}	1155	}
1294		1156
1295	/* Floor face */	1157	if (expect_false (lastcell.player != player))
1296	if (update_space (sl, socket, ms, lastcell, 2))	1158	{
		1159	lastcell.player = player;
		1160
1297	mask \|= 0x4;	1161	mask \|= 0x8;
		1162	*last_ext \|= 0x80;
		1163	last_ext = &sl[sl.length ()];
1298		1164
1299	/* Middle face */	1165	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1300	if (update_space (sl, socket, ms, lastcell, 1))	1166	}
		1167
		1168	if (expect_false (lastcell.flags != flags))
		1169	{
		1170	lastcell.flags = flags;
		1171
1301	mask \|= 0x2;	1172	mask \|= 0x8;
		1173	*last_ext \|= 0x80;
		1174	last_ext = &sl[sl.length ()];
1302		1175
1303	if (ms.player () == ob	1176	sl << uint8 (8) << uint8 (flags);
1304	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1305	{	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	{
1306	// force player to be visible to himself if invisible	1192	// force player to be visible to himself if invisible
1307	if (lastcell.faces[0] != ob->face)	1193	if (lastcell.faces[0] != ob->face)
1308	{	1194	{
1309	lastcell.faces[0] = ob->face;	1195	lastcell.faces[0] = ob->face;
1310		1196
1311	mask \|= 0x1;
1312	sl << uint16 (ob->face);
1313
1314	socket.send_faces (ob);
1315	}
1316	}
1317	/* Top face */
1318	else if (update_space (sl, socket, ms, lastcell, 0))
1319	mask \|= 0x1;	1197	mask \|= 0x1;
		1198	sl << uint16 (ob->face);
1320		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
1321	/* 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
1322	* space by checking the mask. If so, update the mask.	1208	* space by checking the mask. If so, update the mask.
1323	* 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
1324	* value, so we don't send those bits.	1210	* value, so we don't send those bits.
1325	*/	1211	*/
1326	if (mask & 0xf)	1212	if (mask & 0xf)
1327	sl[oldlen + 1] = mask & 0xff;	1213	sl[oldlen + 1] = mask & 0xff;
1328	else	1214	else
1329	sl.reset (oldlen);	1215	sl.reset (oldlen);
1330
1331	if (socket.ext_mapinfos)
1332	esl << uint16 (emask);
1333
1334	if (socket.EMI_smooth)
1335	{
1336	for (int layer = 2+1; layer--; )
1337	{
1338	object *ob = ms.faces_obj [layer];
1339
1340	// If there is no object for this space, or if the face for the object
1341	// is the blank face, set the smoothlevel to zero.
1342	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1343
1344	// We've gotten what face we want to use for the object. Now see if
1345	// if it has changed since we last sent it to the client.
1346	if (lastcell.smooth[layer] != smoothlevel)
1347	{
1348	lastcell.smooth[layer] = smoothlevel;
1349	esl << uint8 (smoothlevel);
1350	emask \|= 1 << layer;
1351	}
1352	}
1353
1354	if (emask & 0xf)
1355	esl[eoldlen + 1] = emask & 0xff;
1356	else
1357	esl.reset (eoldlen);
1358	}
1359	} /* else this is a viewable space */	1216	} /* else this is a viewable space */
1360	} /* for x loop */	1217	ordered_mapwalk_end
1361	} /* for y loop */
1362		1218
1363	socket.flush_fx ();	1219	socket.flush_fx ();
1364
1365	/* Verify that we in fact do need to send this */
1366	if (socket.ext_mapinfos)
1367	{
1368	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1369	{
1370	/* No map data will follow, so don't say the client
1371	* it doesn't need draw!
1372	*/
1373	ewhatflag &= ~EMI_NOREDRAW;
1374	esl[ewhatstart + 1] = ewhatflag & 0xff;
1375	}
1376
1377	if (esl.length () > estartlen)
1378	socket.send_packet (esl);
1379	}
1380		1220
1381	if (sl.length () > startlen \|\| socket.sent_scroll)	1221	if (sl.length () > startlen \|\| socket.sent_scroll)
1382	{	1222	{
1383	socket.send_packet (sl);	1223	socket.send_packet (sl);
1384	socket.sent_scroll = 0;	1224	socket.sent_scroll = 0;
…		…
1405	{	1245	{
1406	packet sl;	1246	packet sl;
1407	sl << "replyinfo skill_info\n";	1247	sl << "replyinfo skill_info\n";
1408		1248
1409	for (int i = 1; i < NUM_SKILLS; i++)	1249	for (int i = 1; i < NUM_SKILLS; i++)
1410	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]);
1411		1251
1412	if (sl.length () > MAXSOCKBUF)	1252	if (sl.length () > MAXSOCKBUF)
1413	{	1253	{
1414	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1254	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1415	fatal (0);	1255	fatal (0);
…		…
1459	if (spell->type == SPELL)	1299	if (spell->type == SPELL)
1460	{	1300	{
1461	int flags = 0;	1301	int flags = 0;
1462		1302
1463	/* check if we need to update it */	1303	/* check if we need to update it */
1464	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1304	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1465	{	1305	{
1466	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1306	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1467	flags \|= UPD_SP_MANA;	1307	flags \|= UPD_SP_MANA;
1468	}	1308	}
1469		1309
1470	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1310	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1471	{	1311	{
1472	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1312	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1473	flags \|= UPD_SP_GRACE;	1313	flags \|= UPD_SP_GRACE;
1474	}	1314	}
1475		1315
1476	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1316	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1477	{	1317	{
1478	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1318	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1479	flags \|= UPD_SP_DAMAGE;	1319	flags \|= UPD_SP_DAMAGE;
1480	}	1320	}
1481		1321
1482	if (flags)	1322	if (flags)
1483	{	1323	{
…		…
1485		1325
1486	sl << "updspell "	1326	sl << "updspell "
1487	<< uint8 (flags)	1327	<< uint8 (flags)
1488	<< uint32 (spell->count);	1328	<< uint32 (spell->count);
1489		1329
1490	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1330	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1491	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1331	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1492	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1332	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1493		1333
1494	pl->ns->send_packet (sl);	1334	pl->ns->send_packet (sl);
1495	}	1335	}
1496	}	1336	}
1497	}	1337	}
…		…
1527	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1367	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1528	return;	1368	return;
1529	}	1369	}
1530		1370
1531	/* store costs and damage in the object struct, to compare to later */	1371	/* store costs and damage in the object struct, to compare to later */
1532	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1372	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1533	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1373	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1534	spell->last_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);
1535		1375
1536	/* figure out which skill it uses, if it uses one */	1376	/* figure out which skill it uses, if it uses one */
1537	if (spell->skill)	1377	if (spell->skill)
1538	{	1378	if (object *tmp = pl->find_skill (spell->skill))
1539	for (i = 1; i < NUM_SKILLS; i++)
1540	if (!strcmp (spell->skill, skill_names[i]))
1541	{
1542	skill = i + CS_STAT_SKILLINFO;	1379	skill = tmp->subtype + CS_STAT_SKILLINFO;
1543	break;
1544	}
1545	}
1546		1380
1547	// spells better have a face	1381	// spells better have a face
1548	if (!spell->face)	1382	if (!spell->face)
1549	{	1383	{
1550	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);
…		…
1555		1389
1556	/* send the current values */	1390	/* send the current values */
1557	sl << uint32 (spell->count)	1391	sl << uint32 (spell->count)
1558	<< uint16 (spell->level)	1392	<< uint16 (spell->level)
1559	<< uint16 (spell->casting_time)	1393	<< uint16 (spell->casting_time)
1560	<< uint16 (spell->last_sp)	1394	<< uint16 (spell->cached_sp)
1561	<< uint16 (spell->last_grace)	1395	<< uint16 (spell->cached_grace)
1562	<< uint16 (spell->last_eat)	1396	<< uint16 (spell->cached_eat)
1563	<< uint8 (skill)	1397	<< uint8 (skill)
1564	<< uint32 (spell->path_attuned)	1398	<< uint32 (spell->path_attuned)
1565	<< uint32 (spell->face)	1399	<< uint32 (spell->face)
1566	<< data8 (spell->name)	1400	<< data8 (spell->name)
1567	<< data16 (spell->msg);	1401	<< data16 (spell->msg);

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.129 by root, Tue May 6 19:37:01 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.129 by root, Tue May 6 19:37:01 2008 UTC vs.
Revision 1.145 by root, Fri Dec 26 10:44:17 2008 UTC