ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.83 by root, Mon Apr 2 18:04:47 2007 UTC vs.
Revision 1.144 by root, Fri Dec 26 10:36:42 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your 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 GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/**	24	/**
26	* \file	25	* \file
27	* Client handling.	26	* Client handling.
…		…
99	*/	98	*/
100	mx = ns->mapx;	99	mx = ns->mapx;
101	my = ns->mapy;	100	my = ns->mapy;
102		101
103	/* 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
104	* (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,
105	* if the destination x or y coordinate is outside the viewable	104	* if the destination x or y coordinate is outside the viewable
106	* area, we clear the values - otherwise, the old values	105	* area, we clear the values - otherwise, the old values
107	* 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.
108	*/	107	*/
109	for (x = 0; x < mx; x++)	108	for (x = 0; x < mx; x++)
110	{
111	for (y = 0; y < my; y++)	109	for (y = 0; y < my; y++)
112	{
113	if (x >= ns->mapx || y >= ns->mapy)	110	if (x >= ns->mapx || y >= ns->mapy)
114	/* clear cells outside the viewable area */	111	/* clear cells outside the viewable area */
115	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	112	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116	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)
117	/* clear newly visible tiles within the viewable area */	114	/* clear newly visible tiles within the viewable area */
118	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	115	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119	else	116	else
120	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));
121	}
122	}
123		118
124	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	119	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125		120
126	/* 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
127	* empty).	122	* empty).
…		…
130	}	125	}
131		126
132	static void	127	static void
133	clear_map (player *pl)	128	clear_map (player *pl)
134	{	129	{
		130	pl->ns->mapinfo_queue_clear ();
		131
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	132	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136		133
137	pl->ns->force_newmap = false;	134	pl->ns->force_newmap = false;
138		135
139	if (pl->ns->newmapcmd == 1)	136	if (pl->ns->newmapcmd == 1)
140	pl->ns->send_packet ("newmap");	137	pl->ns->send_packet ("newmap");
141		138
142	pl->ns->floorbox_reset ();	139	pl->ns->floorbox_reset ();
		140	}
		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	}
143	}	166	}
144		167
145	/** check for map/region change and send new map data */	168	/** check for map/region change and send new map data */
146	static void	169	static void
147	check_map_change (player *pl)	170	check_map_change (player *pl)
148	{	171	{
149	client &socket = *pl->ns;	172	client &socket = *pl->ns;
150	object *ob = pl->ob;	173	object *ob = pl->observe;
151	char buf[MAX_BUF]; /* eauugggh */
152		174
153	if (socket.force_newmap)	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;
154	{	180	}
155	// force newmap is used for clients that do not redraw their map	181
156	// after image uploads.	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	{
157	socket.current_map = ob->map;	192	socket.current_map = ob->map;
158	clear_map (pl);	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	}
159	}	200	}
160	else if (socket.current_map != ob->map)	201
		202	if (socket.current_map != ob->map || socket.force_newmap)
161	{	203	{
162	clear_map (pl);	204	clear_map (pl);
163	socket.current_map = ob->map;	205	socket.current_map = ob->map;
164		206	send_map_info (pl);
165	if (socket.mapinfocmd)
166	{
167	if (ob->map && ob->map->path[0])
168	{
169	int flags = 0;
170
171	if (ob->map->tile_path[0])
172	flags |= 1;
173	if (ob->map->tile_path[1])
174	flags |= 2;
175	if (ob->map->tile_path[2])
176	flags |= 4;
177	if (ob->map->tile_path[3])
178	flags |= 8;
179
180	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182	}
183	else
184	snprintf (buf, MAX_BUF, "mapinfo current");
185
186	socket.send_packet (buf);
187	}
188	}	207	}
189	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)
190	{	209	{
191	int dx = ob->x - socket.current_x;	210	int dx = ob->x - socket.current_x;
192	int dy = ob->y - socket.current_y;	211	int dy = ob->y - socket.current_y;
…		…
200	}	219	}
201	}	220	}
202		221
203	socket.current_x = ob->x;	222	socket.current_x = ob->x;
204	socket.current_y = ob->y;	223	socket.current_y = ob->y;
205
206	region *reg = ob->region ();
207	if (socket.current_region != reg)
208	{
209	socket.current_region = reg;
210	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
211	}
212	}	224	}
213		225
214	/**	226	/**
215	* RequestInfo is sort of a meta command. There is some specific	227	* RequestInfo is sort of a meta command. There is some specific
216	* request of information, but we call other functions to provide	228	* request of information, but we call other functions to provide
217	* that information.	229	* that information.
218	*/	230	*/
219	void	231	void
220	RequestInfo (char *buf, int len, client * ns)	232	RequestInfo (char *buf, int len, client *ns)
221	{	233	{
222	char *params = NULL, *cp;	234	char *params;
223
224	/* No match */
225	char bigbuf[MAX_BUF];
226	int slen;
227
228	/* Set up replyinfo before we modify any of the buffers - this is used
229	* if we don't find a match.
230	*/
231	strcpy (bigbuf, "replyinfo ");
232	slen = strlen (bigbuf);
233	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234		235
235	/* find the first space, make it null, and update the	236	/* find the first space, make it null, and update the
236	* params pointer.	237	* params pointer.
237	*/	238	*/
238	for (cp = buf; *cp != '\0'; cp++)	239	for (params = buf; *params; params++)
239	if (*cp == ' ')	240	if (*params == ' ')
240	{	241	{
241	*cp = '\0';
242	params = cp + 1;	242	*params++ = 0;
243	break;	243	break;
244	}	244	}
245		245
246	if (!strcmp (buf, "image_info"))	246	if (!strcmp (buf, "image_info"))
247	send_image_info (ns, params);	247	send_image_info (ns, params);
…		…
250	else if (!strcmp (buf, "skill_info"))	250	else if (!strcmp (buf, "skill_info"))
251	send_skill_info (ns, params);	251	send_skill_info (ns, params);
252	else if (!strcmp (buf, "spell_paths"))	252	else if (!strcmp (buf, "spell_paths"))
253	send_spell_paths (ns, params);	253	send_spell_paths (ns, params);
254	else	254	else
255	ns->send_packet (bigbuf, len);	255	{
		256	// undo tokenisation above and send replyinfo with the request unchanged
		257	if (*params)
		258	*--params = ' ';
		259
		260	ns->send_packet_printf ("replyinfo %s", buf);
		261	}
256	}	262	}
257		263
258	void	264	void
259	ExtCmd (char *buf, int len, player *pl)	265	ExtCmd (char *buf, int len, player *pl)
260	{	266	{
…		…
263		269
264	void	270	void
265	ExtiCmd (char *buf, int len, client *ns)	271	ExtiCmd (char *buf, int len, client *ns)
266	{	272	{
267	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	273	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		274	}
		275
		276	void
		277	client::mapinfo_queue_clear ()
		278	{
		279	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		280	free (*i);
		281
		282	mapinfo_queue.clear ();
		283	}
		284
		285	bool
		286	client::mapinfo_try (char *buf)
		287	{
		288	char *token = buf;
		289	buf += strlen (buf) + 9;
		290
		291	// initial map and its origin
		292	maptile *map = pl->observe->map;
		293	int mapx = pl->ns->mapx / 2 - pl->observe->x;
		294	int mapy = pl->ns->mapy / 2 - pl->observe->y;
		295	int max_distance = 8; // limit maximum path length to something generous
		296
		297	while (*buf && map && max_distance)
		298	{
		299	int dir = *buf++ - '1';
		300
		301	if (dir >= 0 && dir <= 3)
		302	{
		303	if (!map->tile_path [dir])
		304	map = 0;
		305	else if (map->tile_available (dir, false))
		306	{
		307	maptile *neigh = map->tile_map [dir];
		308
		309	switch (dir)
		310	{
		311	case 0: mapy -= neigh->height; break;
		312	case 2: mapy += map ->height; break;
		313	case 3: mapx -= neigh->width ; break;
		314	case 1: mapx += map ->width ; break;
		315	}
		316
		317	map = neigh;
		318	--max_distance;
		319	}
		320	else
		321	return 0;
		322	}
		323	else
		324	max_distance = 0;
		325	}
		326
		327	if (!max_distance)
		328	send_packet_printf ("mapinfo %s error", token);
		329	else if (!map || !map->path)
		330	send_packet_printf ("mapinfo %s nomap", token);
		331	else
		332	{
		333	int flags = 0;
		334
		335	if (map->tile_path[0]) flags |= 1;
		336	if (map->tile_path[1]) flags |= 2;
		337	if (map->tile_path[2]) flags |= 4;
		338	if (map->tile_path[3]) flags |= 8;
		339
		340	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		341	}
		342
		343	return 1;
		344	}
		345
		346	void
		347	client::mapinfo_queue_run ()
		348	{
		349	if (mapinfo_queue.empty () || !pl)
		350	return;
		351
		352	for (int i = 0; i < mapinfo_queue.size (); ++i)
		353	if (mapinfo_try (mapinfo_queue [i]))
		354	{
		355	free (mapinfo_queue [i]);
		356	mapinfo_queue.erase (i);
		357	}
		358	else
		359	++i;
268	}	360	}
269		361
270	void	362	void
271	MapInfoCmd (char *buf, int len, player *pl)	363	MapInfoCmd (char *buf, int len, player *pl)
272	{	364	{
273	// <mapinfo tag spatial tile-path	365	// <mapinfo tag spatial tile-path
274	// >mapinfo tag spatial flags x y w h hash	366	// >mapinfo tag spatial flags x y w h hash
275		367
276	char bigbuf[MAX_BUF], *token;
277
278	token = buf;	368	char *token = buf;
279	// copy token	369
280	if (!(buf = strchr (buf, ' ')))	370	if (!(buf = strchr (buf, ' ')))
281	return;	371	return;
282		372
283	*buf++ = 0;
284
285	if (!strncmp (buf, "spatial ", 8))	373	if (!strncmp (buf, " spatial ", 9))
286	{	374	{
287	buf += 8;	375	char *copy = strdup (token);
		376	copy [buf - token] = 0;
288		377
289	// initial map and its origin	378	#if 0
290	maptile *map = pl->ob->map;	379	// this makes only sense when we flush the buffer immediately
291	sint16 dx, dy;	380	if (pl->ns->mapinfo_try (copy))
292	int mapx = pl->ns->mapx / 2 - pl->ob->x;	381	free (copy);
293	int mapy = pl->ns->mapy / 2 - pl->ob->y;
294	int max_distance = 8; // limit maximum path length to something generous
295
296	while (*buf && map && max_distance)
297	{
298	int dir = *buf++;
299
300	switch (dir)
301	{
302	case '1':
303	dx = 0;
304	dy = -1;
305	map = map->xy_find (dx, dy);
306	map && (mapy -= map->height);
307	break;
308	case '2':
309	mapx += map->width;
310	dx = map->width;
311	dy = 0;
312	map = map->xy_find (dx, dy);
313	break;
314	case '3':
315	mapy += map->height;
316	dx = 0;
317	dy = map->height;
318	map = map->xy_find (dx, dy);
319	break;
320	case '4':
321	dx = -1;
322	dy = 0;
323	map = map->xy_find (dx, dy);
324	map && (mapx -= map->width);
325	break;
326	}
327
328	--max_distance;
329	}
330
331	if (!max_distance)
332	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
333	else if (map && map->path[0])
334	{
335	int flags = 0;
336
337	if (map->tile_path[0])
338	flags |= 1;
339	if (map->tile_path[1])
340	flags |= 2;
341	if (map->tile_path[2])
342	flags |= 4;
343	if (map->tile_path[3])
344	flags |= 8;
345
346	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
347	}
348	else	382	else
349	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	383	#endif
		384	pl->ns->mapinfo_queue.push_back (copy);
350	}	385	}
351	else	386	else
352	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	387	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
353
354	pl->ns->send_packet (bigbuf);
355	}	388	}
356		389
357	/** This is the Setup cmd */	390	/** This is the Setup cmd */
358	void	391	void
359	SetUp (char *buf, int len, client * ns)	392	SetUp (char *buf, int len, client * ns)
…		…
488		521
489	ns->send_packet (cmdback);	522	ns->send_packet (cmdback);
490	}	523	}
491		524
492	/**	525	/**
493	* client requested an image. send it rate-limited
494	* before flushing.
495	*/
496	void
497	AskFaceCmd (char *buf, int len, client *ns)
498	{
499	ns->askface.push_back (atoi (buf));
500	}
501
502	/**
503	* Tells client the picture it has to use
504	* to smooth a picture number given as argument.
505	*/
506	void
507	AskSmooth (char *buf, int len, client *ns)
508	{
509	ns->send_face (atoi (buf));
510	}
511
512	/**
513	* This handles the general commands from the client (ie, north, fire, cast,	526	* This handles the general commands from the client (ie, north, fire, cast,
514	* etc.)	527	* etc.)
515	*/	528	*/
516	void	529	void
517	PlayerCmd (char *buf, int len, player *pl)	530	PlayerCmd (char *buf, int len, player *pl)
…		…
538	* commands.	551	* commands.
539	*/	552	*/
540	pl->count = 0;	553	pl->count = 0;
541	}	554	}
542		555
543
544	/**	556	/**
545	* This handles the general commands from the client (ie, north, fire, cast,	557	* This handles the general commands from the client (ie, north, fire, cast,
546	* etc.). It is a lot like PlayerCmd above, but is called with the	558	* etc.). It is a lot like PlayerCmd above, but is called with the
547	* 'ncom' method which gives more information back to the client so it	559	* 'ncom' method which gives more information back to the client so it
548	* can throttle.	560	* can throttle.
…		…
550	void	562	void
551	NewPlayerCmd (char *buf, int len, player *pl)	563	NewPlayerCmd (char *buf, int len, player *pl)
552	{	564	{
553	if (len <= 6)	565	if (len <= 6)
554	{	566	{
555	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	567	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
556	return;	568	return;
557	}	569	}
558		570
559	uint16 cmdid = net_uint16 ((uint8 *)buf);	571	uint16 cmdid = net_uint16 ((uint8 *)buf);
560	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	572	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
617	{	629	{
618	case ST_PLAYING:	630	case ST_PLAYING:
619	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	631	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
620	break;	632	break;
621		633
622	case ST_CHANGE_CLASS:
623	key_change_class (pl->ob, buf[0]);
624	break;
625
626	case ST_GET_PARTY_PASSWORD: /* Get password for party */	634	case ST_GET_PARTY_PASSWORD: /* Get password for party */
627	receive_party_password (pl->ob, 13);	635	receive_party_password (pl->ob, 13);
628	break;	636	break;
629		637
630	default:	638	default:
…		…
669		677
670	cp = strchr (cp + 1, ' ');	678	cp = strchr (cp + 1, ' ');
671		679
672	if (cp)	680	if (cp)
673	{	681	{
674	assign (ns->version, cp + 1);	682	ns->version = cp + 1;
675		683
676	if (ns->sc_version < 1026)	684	if (ns->sc_version < 1026)
677	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	685	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
678	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	686	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
679	}	687	}
…		…
702	* syntax is: move (to) (tag) (nrof)	710	* syntax is: move (to) (tag) (nrof)
703	*/	711	*/
704	void	712	void
705	MoveCmd (char *buf, int len, player *pl)	713	MoveCmd (char *buf, int len, player *pl)
706	{	714	{
707	int vals[3], i;	715	int to, tag, nrof;
708		716
709	/* A little funky here. We only cycle for 2 records, because	717	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
710	* we obviously are not going to find a space after the third
711	* record. Perhaps we should just replace this with a
712	* sscanf?
713	*/
714	for (i = 0; i < 2; i++)
715	{	718	{
716	vals[i] = atoi (buf);
717
718	if (!(buf = strchr (buf, ' ')))
719	{
720	LOG (llevError, "Incomplete move command: %s\n", buf);	719	LOG (llevError, "Incomplete move command: %s\n", buf);
721	return;	720	return;
722	}
723
724	buf++;
725	}	721	}
726		722
727	vals[2] = atoi (buf);	723	esrv_move_object (pl->ob, to, tag, nrof);
728
729	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
730	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
731	}	724	}
732		725
733	/******************************************************************************	726	/******************************************************************************
734	*	727	*
735	* Start of commands the server sends to the client.	728	* Start of commands the server sends to the client.
…		…
744	send_query (client *ns, uint8 flags, const char *text)	737	send_query (client *ns, uint8 flags, const char *text)
745	{	738	{
746	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	739	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
747	}	740	}
748		741
		742	/**
		743	* Get player's current range attack in obuf.
		744	*/
		745	static void
		746	rangetostring (player *pl, char *obuf)
		747	{
		748	dynbuf_text buf;
		749
		750	if (pl->ranged_ob)
		751	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		752
		753	if (pl->combat_ob)
		754	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		755
		756	#if 0
		757	//TODO: remove this when slot system is working, this is only for debugging
		758	if (pl->ob->chosen_skill)
		759	buf << " Skill*: " << pl->ob->chosen_skill->name;
		760	#endif
		761
		762	//TODO: maybe golem should become the current_weapon, quite simply?
		763	if (pl->golem)
		764	buf << " Golem*: " << pl->golem->name;
		765
		766	buf << '\0';
		767	buf.linearise (obuf);
		768	}
		769
749	#define AddIfInt64(Old,New,Type) if (Old != New) {\	770	#define AddIfInt64(Old,New,Type) if (Old != New) {\
750	Old = New; \	771	Old = New; \
751	sl << uint8 (Type) << uint64 (New); \	772	sl << uint8 (Type) << uint64 (New); \
752	}	773	}
753		774
…		…
759	#define AddIfShort(Old,New,Type) if (Old != New) {\	780	#define AddIfShort(Old,New,Type) if (Old != New) {\
760	Old = New; \	781	Old = New; \
761	sl << uint8 (Type) << uint16 (New); \	782	sl << uint8 (Type) << uint16 (New); \
762	}	783	}
763		784
764	#define AddIfFloat(Old,New,Type) if (Old != New) {\	785	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
765	Old = New; \	786	Old = New; \
766	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	787	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
767	}	788	}
768		789
769	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	790	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
770	free(Old); Old = strdup (New);\	791	free(Old); Old = strdup (New);\
771	sl << uint8 (Type) << data8 (New); \	792	sl << uint8 (Type) << data8 (New); \
…		…
785		806
786	client *ns = pl->ns;	807	client *ns = pl->ns;
787	if (!ns)	808	if (!ns)
788	return;	809	return;
789		810
790	object *ob = pl->ob;	811	object *ob = pl->observe;
791	if (!ob)	812	if (!ob)
792	return;	813	return;
		814
		815	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
793		816
794	packet sl ("stats");	817	packet sl ("stats");
795		818
796	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	819	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
797	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	820	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
806	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	829	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
807	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	830	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
808	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	831	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
809		832
810	for (int s = 0; s < NUM_SKILLS; s++)	833	for (int s = 0; s < NUM_SKILLS; s++)
811	if (object *skill = pl->last_skill_ob[s])	834	if (object *skill = opl->last_skill_ob [s])
812	if (skill->stats.exp != ns->last_skill_exp [s])	835	if (skill->stats.exp != ns->last_skill_exp [s])
813	{	836	{
814	ns->last_skill_exp [s] = skill->stats.exp;	837	ns->last_skill_exp [s] = skill->stats.exp;
815		838
816	/* Always send along the level if exp changes. This is only	839	/* Always send along the level if exp changes. This is only
…		…
824	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	847	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
825	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	848	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
826	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	849	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
827	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	850	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
828	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	851	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
829	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	852	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
830	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	853	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
831	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	854	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
832	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	855	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
833		856
834	flags = 0;	857	flags = 0;
835		858
836	if (pl->fire_on)	859	if (opl->fire_on)
837	flags |= SF_FIREON;	860	flags |= SF_FIREON;
838		861
839	if (pl->run_on)	862	if (opl->run_on)
840	flags |= SF_RUNON;	863	flags |= SF_RUNON;
841		864
842	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	865	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
843		866
844	if (ns->sc_version < 1025)	867	if (ns->sc_version < 1025)
…		…
858	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	881	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
859	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	882	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
860	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	883	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
861	}	884	}
862		885
863	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	886	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
864	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	887	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
865	set_title (ob, buf);	888	set_title (ob, buf);
866	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	889	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
867		890
868	/* Only send it away if we have some actual data */	891	/* Only send it away if we have some actual data */
…		…
872		895
873	/**	896	/**
874	* Tells the client that here is a player it should start using.	897	* Tells the client that here is a player it should start using.
875	*/	898	*/
876	void	899	void
877	esrv_new_player (player *pl, uint32 weight)	900	esrv_new_player (player *pl)
878	{	901	{
		902	sint32 weight = pl->ob->client_weight ();
		903
879	packet sl ("player");	904	packet sl ("player");
880		905
881	sl << uint32 (pl->ob->count)	906	sl << uint32 (pl->ob->count)
882	<< uint32 (weight)	907	<< uint32 (weight)
883	<< uint32 (pl->ob->face)	908	<< uint32 (pl->ob->face)
884	<< data8 (pl->ob->name);	909	<< data8 (pl->ob->name);
885		910
886	pl->ns->last_weight = weight;	911	pl->ns->last_weight = weight;
887	pl->ns->send_packet (sl);	912	pl->ns->send_packet (sl);
888	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
889	}	913	}
890		914
891	/******************************************************************************	915	/******************************************************************************
892	*	916	*
893	* Start of map related commands.	917	* Start of map related commands.
…		…
950		974
951	if (!ns.faces_sent[face_num])	975	if (!ns.faces_sent[face_num])
952	if (ob)	976	if (ob)
953	ns.send_faces (ob);	977	ns.send_faces (ob);
954	else	978	else
955	ns.send_face (face_num);	979	ns.send_face (face_num, 10);
956		980
957	sl << uint16 (face_num);	981	sl << uint16 (face_num);
958	return 1;	982	return 1;
959	}	983	}
960		984
…		…
1002	{	1026	{
1003	prefetch_surrounding_maps (op->map, 3);	1027	prefetch_surrounding_maps (op->map, 3);
1004	}	1028	}
1005		1029
1006	/**	1030	/**
1007	* This function uses the new map1 protocol command to send the map	1031	* Draws client map.
1008	* to the client. It is necessary because the old map command supports
1009	* a maximum map size of 15x15.
1010	* This function is much simpler than the old one. This is because
1011	* the old function optimized to send as few face identifiers as possible,
1012	* at the expense of sending more coordinate location (coordinates were
1013	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1014	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1015	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1016	* and use the other 4 bits for other informatiion. For full documentation
1017	* of what we send, see the doc/Protocol file.
1018	* I will describe internally what we do:
1019	* the ns->lastmap shows how the map last looked when sent to the client.
1020	* in the lastmap structure, there is a cells array, which is set to the
1021	* maximum viewable size (As set in config.h).
1022	* in the cells, there are faces and a count value.
1023	* we use the count value to hold the darkness value. If -1, then this space
1024	* is not viewable.
1025	* we use faces[0] faces[1] faces[2] to hold what the three layers
1026	* look like.
1027	*/	1032	*/
1028	void	1033	void
1029	draw_client_map1 (object *pl)	1034	draw_client_map (player *pl)
1030	{	1035	{
1031	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	1036	object *ob = pl->observe;
1032	sint16 nx, ny;	1037	if (!ob->active)
		1038	return;
		1039
		1040	/* If player is just joining the game, he isn't here yet, so the map
		1041	* can get swapped out. If so, don't try to send them a map. All will
		1042	* be OK once they really log in.
		1043	*/
		1044	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
		1045	return;
		1046
		1047	int startlen, oldlen;
1033	int estartlen, eoldlen;	1048	int estartlen, eoldlen;
1034	uint8 eentrysize;	1049	uint8 eentrysize;
1035	uint16 ewhatstart, ewhatflag;	1050	uint16 ewhatstart, ewhatflag;
1036	uint8 extendedinfos;	1051	uint8 extendedinfos;
1037	maptile *m;
1038		1052
1039	client &socket = *pl->contr->ns;
1040
1041	if (!pl->active)
1042	return;
1043
1044	check_map_change (pl->contr);	1053	check_map_change (pl);
1045	prefetch_surrounding_maps (pl);	1054	prefetch_surrounding_maps (pl->ob);
		1055
		1056	/* do LOS after calls to update_position */
		1057	/* unfortunately, we need to udpate los when observing, currently */
		1058	if (pl->do_los || pl->observe != pl->ob)
		1059	{
		1060	pl->do_los = 0;
		1061	pl->update_los ();
		1062	}
		1063
		1064	/**
		1065	* This function uses the new map1 protocol command to send the map
		1066	* to the client. It is necessary because the old map command supports
		1067	* a maximum map size of 15x15.
		1068	* This function is much simpler than the old one. This is because
		1069	* the old function optimized to send as few face identifiers as possible,
		1070	* at the expense of sending more coordinate location (coordinates were
		1071	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		1072	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		1073	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		1074	* and use the other 4 bits for other informatiion. For full documentation
		1075	* of what we send, see the doc/Protocol file.
		1076	* I will describe internally what we do:
		1077	* the ns->lastmap shows how the map last looked when sent to the client.
		1078	* in the lastmap structure, there is a cells array, which is set to the
		1079	* maximum viewable size (As set in config.h).
		1080	* in the cells, there are faces and a count value.
		1081	* we use the count value to hold the darkness value. If -1, then this space
		1082	* is not viewable.
		1083	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1084	* look like.
		1085	*/
		1086
		1087	client &socket = *pl->ns;
1046		1088
1047	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1089	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1048	packet esl;	1090	packet esl;
1049		1091
1050	startlen = sl.length ();	1092	startlen = sl.length ();
…		…
1066	<< uint8 (eentrysize);	1108	<< uint8 (eentrysize);
1067		1109
1068	estartlen = esl.length ();	1110	estartlen = esl.length ();
1069	}	1111	}
1070		1112
1071	/* x,y are the real map locations. ax, ay are viewport relative	1113	int hx = socket.mapx / 2;
1072	* locations.	1114	int hy = socket.mapy / 2;
1073	*/
1074	ay = 0;
1075		1115
1076	/* We could do this logic as conditionals in the if statement,	1116	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1077	* but that started to get a bit messy to look at.	1117	int ax = dx + hx;
1078	*/	1118	int ay = dy + hy;
1079	max_x = pl->x + (socket.mapx + 1) / 2;
1080	max_y = pl->y + (socket.mapy + 1) / 2;
1081		1119
1082	maptile *plmap = pl->map;
1083
1084	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1085	{
1086	ax = 0;
1087	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1088	{
1089	int emask, mask;	1120	int emask, mask;
1090	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1121	emask = mask = (ax << 10) | (ay << 4);
1091		1122
1092	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1123	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1093		1124
1094	/* If the coordinates are not valid, or it is too dark to see,	1125	/* If the coordinates are not valid, or it is too dark to see,
1095	* we tell the client as such	1126	* we tell the client as such
1096	*/	1127	*/
1097	nx = x;
1098	ny = y;
1099	m = get_map_from_coord (plmap, &nx, &ny);
1100
1101	if (!m)	1128	if (!m)
1102	{	1129	{
1103	/* space is out of map. Update space and clear values	1130	/* space is out of map. Update space and clear values
1104	* if this hasn't already been done. If the space is out	1131	* if this hasn't already been done. If the space is out
1105	* of the map, it shouldn't have a head	1132	* of the map, it shouldn't have a head.
1106	*/	1133	*/
1107	if (lastcell.count != -1)	1134	if (lastcell.count != -1)
		1135	{
		1136	sl << uint16 (mask);
		1137	map_clearcell (&lastcell, -1);
		1138	}
		1139
		1140	continue;
		1141	}
		1142
		1143	int d = pl->blocked_los_uc (dx, dy);
		1144
		1145	if (d > 3)
		1146	{
		1147	/* This block deals with spaces that are not visible for whatever
		1148	* reason. Still may need to send the head for this space.
		1149	*/
		1150	if (lastcell.count != -1
		1151	|| lastcell.faces[0]
		1152	|| lastcell.faces[1]
		1153	|| lastcell.faces[2]
		1154	|| lastcell.stat_hp
		1155	|| lastcell.flags
		1156	|| lastcell.player)
		1157	sl << uint16 (mask);
		1158
		1159	/* properly clear a previously sent big face */
		1160	map_clearcell (&lastcell, -1);
		1161	}
		1162	else
		1163	{
		1164	/* In this block, the space is visible.
		1165	*/
		1166
		1167	/* Rather than try to figure out what everything that we might
		1168	* need to send is, then form the packet after that,
		1169	* we presume that we will in fact form a packet, and update
		1170	* the bits by what we do actually send. If we send nothing,
		1171	* we just back out sl.length () to the old value, and no harm
		1172	* is done.
		1173	* 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
		1175	* doing those checks again to add the real data.
		1176	*/
		1177	oldlen = sl.length ();
		1178	eoldlen = esl.length ();
		1179
		1180	sl << uint16 (mask);
		1181
		1182	unsigned char dummy;
		1183	unsigned char *last_ext = &dummy;
		1184
		1185	/* Darkness changed */
		1186	if (lastcell.count != d && socket.darkness)
		1187	{
		1188	mask |= 0x8;
		1189
		1190	if (socket.extmap)
		1191	{
		1192	*last_ext |= 0x80;
		1193	last_ext = &sl[sl.length ()];
		1194	sl << uint8 (d);
		1195	}
		1196	else
		1197	sl << uint8 (255 - 64 * d);
		1198	}
		1199
		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)
1108	{	1215	{
1109	sl << uint16 (mask);	1216	if (op->stats.maxhp > op->stats.hp
1110	map_clearcell (&lastcell, -1);	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;
1111	}	1235	}
1112		1236
1113	continue;	1237	if (expect_false (lastcell.stat_hp != stat_hp))
1114	}
1115
1116	m->touch ();
1117
1118	int d = pl->contr->blocked_los[ax][ay];
1119
1120	if (d > 3)
1121	{
1122
1123	int need_send = 0, count;
1124
1125	/* This block deals with spaces that are not visible for whatever
1126	* reason. Still may need to send the head for this space.
1127	*/
1128
1129	oldlen = sl.length ();
1130
1131	sl << uint16 (mask);
1132
1133	if (lastcell.count != -1)
1134	need_send = 1;
1135
1136	count = -1;
1137
1138	/* properly clear a previously sent big face */
1139	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1140	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1141	need_send = 1;
1142
1143	map_clearcell (&lastcell, count);
1144
1145	if ((mask & 0xf) || need_send)
1146	sl[oldlen + 1] = mask & 0xff;
1147	else
1148	sl.reset (oldlen);
1149	}
1150	else
1151	{
1152	/* In this block, the space is visible.
1153	*/
1154
1155	/* Rather than try to figure out what everything that we might
1156	* need to send is, then form the packet after that,
1157	* we presume that we will in fact form a packet, and update
1158	* the bits by what we do actually send. If we send nothing,
1159	* we just back out sl.length () to the old value, and no harm
1160	* is done.
1161	* I think this is simpler than doing a bunch of checks to see
1162	* what if anything we need to send, setting the bits, then
1163	* doing those checks again to add the real data.
1164	*/
1165	oldlen = sl.length ();
1166	eoldlen = esl.length ();
1167
1168	sl << uint16 (mask);
1169
1170	unsigned char dummy;
1171	unsigned char *last_ext = &dummy;
1172
1173	/* Darkness changed */
1174	if (lastcell.count != d && socket.darkness)
1175	{	1238	{
		1239	lastcell.stat_hp = stat_hp;
		1240
1176	mask |= 0x8;	1241	mask |= 0x8;
		1242	*last_ext |= 0x80;
		1243	last_ext = &sl[sl.length ()];
1177		1244
1178	if (socket.extmap)	1245	sl << uint8 (5) << uint8 (stat_hp);
		1246
		1247	if (stat_width > 1)
1179	{	1248	{
1180	*last_ext |= 0x80;	1249	*last_ext |= 0x80;
1181	last_ext = &sl[sl.length ()];	1250	last_ext = &sl[sl.length ()];
1182	sl << uint8 (d);
1183	}
1184	else
1185	sl << uint8 (255 - 64 * d);
1186	}
1187		1251
1188	lastcell.count = d;
1189
1190	mapspace &ms = m->at (nx, ny);
1191
1192	if (socket.extmap)
1193	{
1194	uint8 stat_hp = 0;
1195	uint8 stat_width = 0;
1196	uint8 flags = 0;
1197	UUID player = 0;
1198
1199	// send hp information, if applicable
1200	if (object *op = ms.faces_obj [0])
1201	{
1202	if (op->head || op->invisible)
1203	; // do not show
1204	else if (op->type == PLAYER
1205	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1206	{
1207	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1208	{
1209	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1210	stat_width = op->arch->tail_x;
1211	}
1212	}
1213
1214	if (op->msg && op->msg[0] == '@')
1215	flags |= 1;
1216
1217	if (op->type == PLAYER && op != pl)
1218	player = op->count;
1219	}
1220
1221	if (lastcell.stat_hp != stat_hp)
1222	{
1223	lastcell.stat_hp = stat_hp;
1224
1225	mask |= 0x8;
1226	*last_ext |= 0x80;
1227	last_ext = &sl[sl.length ()];
1228
1229	sl << uint8 (5) << uint8 (stat_hp);
1230
1231	if (stat_width > 1)
1232	{
1233	*last_ext |= 0x80;
1234	last_ext = &sl[sl.length ()];
1235
1236	sl << uint8 (6) << uint8 (stat_width);	1252	sl << uint8 (6) << uint8 (stat_width);
1237	}
1238	}	1253	}
1239
1240	if (lastcell.player != player)
1241	{
1242	lastcell.player = player;
1243
1244	mask |= 0x8;
1245	*last_ext |= 0x80;
1246	last_ext = &sl[sl.length ()];
1247
1248	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1249	}
1250
1251	if (lastcell.flags != flags)
1252	{
1253	lastcell.flags = flags;
1254
1255	mask |= 0x8;
1256	*last_ext |= 0x80;
1257	last_ext = &sl[sl.length ()];
1258
1259	sl << uint8 (8) << uint8 (flags);
1260	}
1261	}	1254	}
1262		1255
1263	/* Floor face */	1256	if (expect_false (lastcell.player != player))
1264	if (update_space (sl, socket, ms, lastcell, 2))	1257	{
		1258	lastcell.player = player;
		1259
1265	mask |= 0x4;	1260	mask |= 0x8;
		1261	*last_ext |= 0x80;
		1262	last_ext = &sl[sl.length ()];
1266		1263
1267	/* Middle face */	1264	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1268	if (update_space (sl, socket, ms, lastcell, 1))	1265	}
		1266
		1267	if (expect_false (lastcell.flags != flags))
		1268	{
		1269	lastcell.flags = flags;
		1270
1269	mask |= 0x2;	1271	mask |= 0x8;
		1272	*last_ext |= 0x80;
		1273	last_ext = &sl[sl.length ()];
1270		1274
1271	if (ms.player () == pl	1275	sl << uint8 (8) << uint8 (flags);
1272	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1273	{	1276	}
		1277	}
		1278
		1279	/* Floor face */
		1280	if (update_space (sl, socket, ms, lastcell, 2))
		1281	mask |= 0x4;
		1282
		1283	/* Middle face */
		1284	if (update_space (sl, socket, ms, lastcell, 1))
		1285	mask |= 0x2;
		1286
		1287	if (expect_false (ob->invisible)
		1288	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
		1289	&& ms.player () == ob)
		1290	{
1274	// force player to be visible to himself if invisible	1291	// force player to be visible to himself if invisible
1275	if (lastcell.faces[0] != pl->face)	1292	if (lastcell.faces[0] != ob->face)
1276	{	1293	{
1277	lastcell.faces[0] = pl->face;	1294	lastcell.faces[0] = ob->face;
1278		1295
1279	mask |= 0x1;
1280	sl << uint16 (pl->face);
1281
1282	socket.send_faces (pl);
1283	}
1284	}
1285	/* Top face */
1286	else if (update_space (sl, socket, ms, lastcell, 0))
1287	mask |= 0x1;	1296	mask |= 0x1;
		1297	sl << uint16 (ob->face);
		1298
		1299	socket.send_faces (ob);
1288		1300	}
		1301	}
		1302	/* Top face */
		1303	else if (update_space (sl, socket, ms, lastcell, 0))
		1304	mask |= 0x1;
1289		1305
1290	/* Check to see if we are in fact sending anything for this	1306	/* Check to see if we are in fact sending anything for this
1291	* space by checking the mask. If so, update the mask.	1307	* space by checking the mask. If so, update the mask.
1292	* if not, reset the len to that from before adding the mask	1308	* if not, reset the len to that from before adding the mask
1293	* value, so we don't send those bits.	1309	* value, so we don't send those bits.
1294	*/	1310	*/
1295	if (mask & 0xf)	1311	if (mask & 0xf)
1296	sl[oldlen + 1] = mask & 0xff;	1312	sl[oldlen + 1] = mask & 0xff;
1297	else	1313	else
1298	sl.reset (oldlen);	1314	sl.reset (oldlen);
1299		1315
1300	if (socket.ext_mapinfos)	1316	if (socket.ext_mapinfos)
1301	esl << uint16 (emask);	1317	esl << uint16 (emask);
1302		1318
1303	if (socket.EMI_smooth)	1319	if (socket.EMI_smooth)
		1320	{
		1321	for (int layer = 2+1; layer--; )
1304	{	1322	{
1305	for (int layer = 2+1; layer--; )
1306	{
1307	object *ob = ms.faces_obj [layer];	1323	object *ob = ms.faces_obj [layer];
1308		1324
1309	// If there is no object for this space, or if the face for the object	1325	// If there is no object for this space, or if the face for the object
1310	// is the blank face, set the smoothlevel to zero.	1326	// is the blank face, set the smoothlevel to zero.
1311	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;	1327	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1312		1328
1313	// We've gotten what face we want to use for the object. Now see if	1329	// We've gotten what face we want to use for the object. Now see if
1314	// if it has changed since we last sent it to the client.	1330	// if it has changed since we last sent it to the client.
1315	if (lastcell.smooth[layer] != smoothlevel)	1331	if (lastcell.smooth[layer] != smoothlevel)
1316	{	1332	{
1317	lastcell.smooth[layer] = smoothlevel;	1333	lastcell.smooth[layer] = smoothlevel;
1318	esl << uint8 (smoothlevel);	1334	esl << uint8 (smoothlevel);
1319	emask |= 1 << layer;	1335	emask |= 1 << layer;
1320	}
1321	}	1336	}
		1337	}
1322		1338
1323	if (emask & 0xf)	1339	if (emask & 0xf)
1324	esl[eoldlen + 1] = emask & 0xff;	1340	esl[eoldlen + 1] = emask & 0xff;
1325	else	1341	else
1326	esl.reset (eoldlen);	1342	esl.reset (eoldlen);
1327	}	1343	}
1328	} /* else this is a viewable space */	1344	} /* else this is a viewable space */
1329	} /* for x loop */	1345	ordered_mapwalk_end
1330	} /* for y loop */	1346
		1347	socket.flush_fx ();
1331		1348
1332	/* Verify that we in fact do need to send this */	1349	/* Verify that we in fact do need to send this */
1333	if (socket.ext_mapinfos)	1350	if (socket.ext_mapinfos)
1334	{	1351	{
1335	if (!(sl.length () > startlen || socket.sent_scroll))	1352	if (!(sl.length () > startlen || socket.sent_scroll))
…		…
1350	socket.send_packet (sl);	1367	socket.send_packet (sl);
1351	socket.sent_scroll = 0;	1368	socket.sent_scroll = 0;
1352	}	1369	}
1353	}	1370	}
1354		1371
1355	/**
1356	* Draws client map.
1357	*/
1358	void
1359	draw_client_map (object *pl)
1360	{
1361	int i, j;
1362	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1363	int mflags;
1364	struct Map newmap;
1365	maptile *m, *pm;
1366
1367	if (pl->type != PLAYER)
1368	{
1369	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1370	return;
1371	}
1372
1373	pm = pl->map;
1374
1375	/* If player is just joining the game, he isn't here yet, so the map
1376	* can get swapped out. If so, don't try to send them a map. All will
1377	* be OK once they really log in.
1378	*/
1379	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1380	return;
1381
1382	memset (&newmap, 0, sizeof (struct Map));
1383
1384	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1385	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1386	{
1387	ax = i;
1388	ay = j;
1389	m = pm;
1390	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1391
1392	if (mflags & P_OUT_OF_MAP)
1393	continue;
1394
1395	/* If a map is visible to the player, we don't want to swap it out
1396	* just to reload it. This should really call something like
1397	* swap_map, but this is much more efficient and 'good enough'
1398	*/
1399	if (mflags & P_NEW_MAP)
1400	m->timeout = 50;
1401	}
1402
1403	/* do LOS after calls to update_position */
1404	if (pl->contr->do_los)
1405	{
1406	update_los (pl);
1407	pl->contr->do_los = 0;
1408	}
1409
1410	/* Big maps need a different drawing mechanism to work */
1411	draw_client_map1 (pl);
1412	}
1413
1414
1415	/*****************************************************************************/	1372	/*****************************************************************************/
1416
1417	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1373	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1418
1419	/* a player. Of course, the client need to know the command to be able to */	1374	/* a player. Of course, the client need to know the command to be able to */
1420
1421	/* manage it ! */	1375	/* manage it ! */
1422
1423	/*****************************************************************************/	1376	/*****************************************************************************/
1424	void	1377	void
1425	send_plugin_custom_message (object *pl, char *buf)	1378	send_plugin_custom_message (object *pl, char *buf)
1426	{	1379	{
1427	pl->contr->ns->send_packet (buf);	1380	pl->contr->ns->send_packet (buf);
…		…
1436	{	1389	{
1437	packet sl;	1390	packet sl;
1438	sl << "replyinfo skill_info\n";	1391	sl << "replyinfo skill_info\n";
1439		1392
1440	for (int i = 1; i < NUM_SKILLS; i++)	1393	for (int i = 1; i < NUM_SKILLS; i++)
1441	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1394	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1442		1395
1443	if (sl.length () >= MAXSOCKBUF)	1396	if (sl.length () > MAXSOCKBUF)
1444	{	1397	{
1445	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1398	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1446	fatal (0);	1399	fatal (0);
1447	}	1400	}
1448		1401
…		…
1461	sl << "replyinfo spell_paths\n";	1414	sl << "replyinfo spell_paths\n";
1462		1415
1463	for (int i = 0; i < NRSPELLPATHS; i++)	1416	for (int i = 0; i < NRSPELLPATHS; i++)
1464	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1417	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1465		1418
1466	if (sl.length () >= MAXSOCKBUF)	1419	if (sl.length () > MAXSOCKBUF)
1467	{	1420	{
1468	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1421	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1469	fatal (0);	1422	fatal (0);
1470	}	1423	}
1471		1424
…		…
1490	if (spell->type == SPELL)	1443	if (spell->type == SPELL)
1491	{	1444	{
1492	int flags = 0;	1445	int flags = 0;
1493		1446
1494	/* check if we need to update it */	1447	/* check if we need to update it */
1495	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1448	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1496	{	1449	{
1497	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1450	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1498	flags |= UPD_SP_MANA;	1451	flags |= UPD_SP_MANA;
1499	}	1452	}
1500		1453
1501	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1454	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1502	{	1455	{
1503	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1456	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1504	flags |= UPD_SP_GRACE;	1457	flags |= UPD_SP_GRACE;
1505	}	1458	}
1506		1459
1507	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1460	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1508	{	1461	{
1509	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1462	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1510	flags |= UPD_SP_DAMAGE;	1463	flags |= UPD_SP_DAMAGE;
1511	}	1464	}
1512		1465
1513	if (flags)	1466	if (flags)
1514	{	1467	{
…		…
1516		1469
1517	sl << "updspell "	1470	sl << "updspell "
1518	<< uint8 (flags)	1471	<< uint8 (flags)
1519	<< uint32 (spell->count);	1472	<< uint32 (spell->count);
1520		1473
1521	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1474	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1522	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1475	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1523	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1476	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1524		1477
1525	pl->ns->send_packet (sl);	1478	pl->ns->send_packet (sl);
1526	}	1479	}
1527	}	1480	}
1528	}	1481	}
…		…
1558	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1511	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1559	return;	1512	return;
1560	}	1513	}
1561		1514
1562	/* store costs and damage in the object struct, to compare to later */	1515	/* store costs and damage in the object struct, to compare to later */
1563	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1516	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1564	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1517	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1565	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1518	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1566		1519
1567	/* figure out which skill it uses, if it uses one */	1520	/* figure out which skill it uses, if it uses one */
1568	if (spell->skill)	1521	if (spell->skill)
1569	{	1522	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;	1523	skill = tmp->subtype + CS_STAT_SKILLINFO;
1574	break;
1575	}
1576	}
1577		1524
1578	// spells better have a face	1525	// spells better have a face
1579	if (!spell->face)	1526	if (!spell->face)
1580	{	1527	{
1581	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1528	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1582	spell->face = face_find ("burnout.x11", blank_face);	1529	spell->face = face_find ("burnout.x11", blank_face);
1583	}	1530	}
		1531
		1532	pl->ns->send_face (spell->face);
1584		1533
1585	/* send the current values */	1534	/* send the current values */
1586	sl << uint32 (spell->count)	1535	sl << uint32 (spell->count)
1587	<< uint16 (spell->level)	1536	<< uint16 (spell->level)
1588	<< uint16 (spell->casting_time)	1537	<< uint16 (spell->casting_time)
1589	<< uint16 (spell->last_sp)	1538	<< uint16 (spell->cached_sp)
1590	<< uint16 (spell->last_grace)	1539	<< uint16 (spell->cached_grace)
1591	<< uint16 (spell->last_eat)	1540	<< uint16 (spell->cached_eat)
1592	<< uint8 (skill)	1541	<< uint8 (skill)
1593	<< uint32 (spell->path_attuned)	1542	<< uint32 (spell->path_attuned)
1594	<< uint32 (spell->face)	1543	<< uint32 (spell->face)
1595	<< data8 (spell->name)	1544	<< data8 (spell->name)
1596	<< data16 (spell->msg);	1545	<< data16 (spell->msg);
…		…
1624	* bytes and 3 strings (because that is the spec) so we need to	1573	* bytes and 3 strings (because that is the spec) so we need to
1625	* check that the length of those 3 strings, plus the 23 bytes,	1574	* check that the length of those 3 strings, plus the 23 bytes,
1626	* won't take us over the length limit for the socket, if it does,	1575	* won't take us over the length limit for the socket, if it does,
1627	* we need to send what we already have, and restart packet formation	1576	* we need to send what we already have, and restart packet formation
1628	*/	1577	*/
		1578	if (spell->type != SPELL)
		1579	continue;
		1580
1629	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1581	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1630	* to show add_spell is 26 bytes + 2 strings. However, the overun	1582	* to show add_spell is 26 bytes + 2 strings. However, the overun
1631	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1583	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1632	* like it will fix this	1584	* like it will fix this
1633	*/	1585	*/
1634	if (spell->type != SPELL)
1635	continue;
1636
1637	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1586	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1638	{	1587	{
		1588	pl->ns->flush_fx ();
1639	pl->ns->send_packet (sl);	1589	pl->ns->send_packet (sl);
1640		1590
1641	sl.reset ();	1591	sl.reset ();
1642	sl << "addspell ";	1592	sl << "addspell ";
1643	}	1593	}
…		…
1651	return;	1601	return;
1652	}	1602	}
1653	else	1603	else
1654	append_spell (pl, sl, spell);	1604	append_spell (pl, sl, spell);
1655		1605
1656	if (sl.length () >= MAXSOCKBUF)	1606	if (sl.length () > MAXSOCKBUF)
1657	{	1607	{
1658	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1608	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1659	fatal (0);	1609	fatal (0);
1660	}	1610	}
1661		1611
1662	/* finally, we can send the packet */	1612	/* finally, we can send the packet */
		1613	pl->ns->flush_fx ();
1663	pl->ns->send_packet (sl);	1614	pl->ns->send_packet (sl);
1664	}	1615	}
1665		1616

Diff Legend

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