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.84 by root, Tue Apr 3 00:21:38 2007 UTC vs.
Revision 1.145 by root, Fri Dec 26 10:44:17 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)
…		…
369	*/	402	*/
370	void	403	void
371	AddMeCmd (char *buf, int len, client *ns)	404	AddMeCmd (char *buf, int len, client *ns)
372	{	405	{
373	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	406	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
374	}
375
376	/** Reply to ExtendedInfos command */
377	void
378	ToggleExtendedInfos (char *buf, int len, client * ns)
379	{
380	char cmdback[MAX_BUF];
381	char command[50];
382	int info, nextinfo;
383
384	cmdback[0] = '\0';
385	nextinfo = 0;
386
387	while (1)
388	{
389	/* 1. Extract an info */
390	info = nextinfo;
391
392	while ((info < len) && (buf[info] == ' '))
393	info++;
394
395	if (info >= len)
396	break;
397
398	nextinfo = info + 1;
399
400	while ((nextinfo < len) && (buf[nextinfo] != ' '))
401	nextinfo++;
402
403	if (nextinfo - info >= 49) /*Erroneous info asked */
404	continue;
405
406	strncpy (command, &(buf[info]), nextinfo - info);
407
408	/* 2. Interpret info */
409	if (!strcmp ("smooth", command))
410	/* Toggle smoothing */
411	ns->EMI_smooth = !ns->EMI_smooth;
412	else
413	/*bad value */;
414
415	/*3. Next info */
416	}
417
418	strcpy (cmdback, "ExtendedInfoSet");
419
420	if (ns->EMI_smooth)
421	{
422	strcat (cmdback, " ");
423	strcat (cmdback, "smoothing");
424	}
425
426	ns->send_packet (cmdback);
427	}	407	}
428		408
429	/*	409	/*
430	#define MSG_TYPE_BOOK 1	410	#define MSG_TYPE_BOOK 1
431	#define MSG_TYPE_CARD 2	411	#define MSG_TYPE_CARD 2
…		…
488		468
489	ns->send_packet (cmdback);	469	ns->send_packet (cmdback);
490	}	470	}
491		471
492	/**	472	/**
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	ns->flush_fx ();
511	}
512
513	/**
514	* This handles the general commands from the client (ie, north, fire, cast,	473	* This handles the general commands from the client (ie, north, fire, cast,
515	* etc.)	474	* etc.)
516	*/	475	*/
517	void	476	void
518	PlayerCmd (char *buf, int len, player *pl)	477	PlayerCmd (char *buf, int len, player *pl)
…		…
539	* commands.	498	* commands.
540	*/	499	*/
541	pl->count = 0;	500	pl->count = 0;
542	}	501	}
543		502
544
545	/**	503	/**
546	* This handles the general commands from the client (ie, north, fire, cast,	504	* This handles the general commands from the client (ie, north, fire, cast,
547	* etc.). It is a lot like PlayerCmd above, but is called with the	505	* etc.). It is a lot like PlayerCmd above, but is called with the
548	* 'ncom' method which gives more information back to the client so it	506	* 'ncom' method which gives more information back to the client so it
549	* can throttle.	507	* can throttle.
…		…
551	void	509	void
552	NewPlayerCmd (char *buf, int len, player *pl)	510	NewPlayerCmd (char *buf, int len, player *pl)
553	{	511	{
554	if (len <= 6)	512	if (len <= 6)
555	{	513	{
556	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	514	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
557	return;	515	return;
558	}	516	}
559		517
560	uint16 cmdid = net_uint16 ((uint8 *)buf);	518	uint16 cmdid = net_uint16 ((uint8 *)buf);
561	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	519	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
618	{	576	{
619	case ST_PLAYING:	577	case ST_PLAYING:
620	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	578	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
621	break;	579	break;
622		580
623	case ST_CHANGE_CLASS:
624	key_change_class (pl->ob, buf[0]);
625	break;
626
627	case ST_GET_PARTY_PASSWORD: /* Get password for party */	581	case ST_GET_PARTY_PASSWORD: /* Get password for party */
628	receive_party_password (pl->ob, 13);	582	receive_party_password (pl->ob, 13);
629	break;	583	break;
630		584
631	default:	585	default:
…		…
670		624
671	cp = strchr (cp + 1, ' ');	625	cp = strchr (cp + 1, ' ');
672		626
673	if (cp)	627	if (cp)
674	{	628	{
675	assign (ns->version, cp + 1);	629	ns->version = cp + 1;
676		630
677	if (ns->sc_version < 1026)	631	if (ns->sc_version < 1026)
678	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	632	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
679	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	633	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
680	}	634	}
…		…
703	* syntax is: move (to) (tag) (nrof)	657	* syntax is: move (to) (tag) (nrof)
704	*/	658	*/
705	void	659	void
706	MoveCmd (char *buf, int len, player *pl)	660	MoveCmd (char *buf, int len, player *pl)
707	{	661	{
708	int vals[3], i;	662	int to, tag, nrof;
709		663
710	/* A little funky here. We only cycle for 2 records, because	664	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
711	* we obviously are not going to find a space after the third
712	* record. Perhaps we should just replace this with a
713	* sscanf?
714	*/
715	for (i = 0; i < 2; i++)
716	{	665	{
717	vals[i] = atoi (buf);
718
719	if (!(buf = strchr (buf, ' ')))
720	{
721	LOG (llevError, "Incomplete move command: %s\n", buf);	666	LOG (llevError, "Incomplete move command: %s\n", buf);
722	return;	667	return;
723	}
724
725	buf++;
726	}	668	}
727		669
728	vals[2] = atoi (buf);	670	esrv_move_object (pl->ob, to, tag, nrof);
729
730	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
731	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
732	}	671	}
733		672
734	/******************************************************************************	673	/******************************************************************************
735	*	674	*
736	* Start of commands the server sends to the client.	675	* Start of commands the server sends to the client.
…		…
745	send_query (client *ns, uint8 flags, const char *text)	684	send_query (client *ns, uint8 flags, const char *text)
746	{	685	{
747	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	686	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
748	}	687	}
749		688
		689	/**
		690	* Get player's current range attack in obuf.
		691	*/
		692	static void
		693	rangetostring (player *pl, char *obuf)
		694	{
		695	dynbuf_text buf;
		696
		697	if (pl->ranged_ob)
		698	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		699
		700	if (pl->combat_ob)
		701	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		702
		703	#if 0
		704	//TODO: remove this when slot system is working, this is only for debugging
		705	if (pl->ob->chosen_skill)
		706	buf << " Skill*: " << pl->ob->chosen_skill->name;
		707	#endif
		708
		709	//TODO: maybe golem should become the current_weapon, quite simply?
		710	if (pl->golem)
		711	buf << " Golem*: " << pl->golem->name;
		712
		713	buf << '\0';
		714	buf.linearise (obuf);
		715	}
		716
750	#define AddIfInt64(Old,New,Type) if (Old != New) {\	717	#define AddIfInt64(Old,New,Type) if (Old != New) {\
751	Old = New; \	718	Old = New; \
752	sl << uint8 (Type) << uint64 (New); \	719	sl << uint8 (Type) << uint64 (New); \
753	}	720	}
754		721
…		…
760	#define AddIfShort(Old,New,Type) if (Old != New) {\	727	#define AddIfShort(Old,New,Type) if (Old != New) {\
761	Old = New; \	728	Old = New; \
762	sl << uint8 (Type) << uint16 (New); \	729	sl << uint8 (Type) << uint16 (New); \
763	}	730	}
764		731
765	#define AddIfFloat(Old,New,Type) if (Old != New) {\	732	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
766	Old = New; \	733	Old = New; \
767	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	734	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
768	}	735	}
769		736
770	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	737	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
771	free(Old); Old = strdup (New);\	738	free(Old); Old = strdup (New);\
772	sl << uint8 (Type) << data8 (New); \	739	sl << uint8 (Type) << data8 (New); \
…		…
786		753
787	client *ns = pl->ns;	754	client *ns = pl->ns;
788	if (!ns)	755	if (!ns)
789	return;	756	return;
790		757
791	object *ob = pl->ob;	758	object *ob = pl->observe;
792	if (!ob)	759	if (!ob)
793	return;	760	return;
		761
		762	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
794		763
795	packet sl ("stats");	764	packet sl ("stats");
796		765
797	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	766	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
798	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	767	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
807	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	776	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
808	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	777	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
809	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	778	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
810		779
811	for (int s = 0; s < NUM_SKILLS; s++)	780	for (int s = 0; s < NUM_SKILLS; s++)
812	if (object *skill = pl->last_skill_ob[s])	781	if (object *skill = opl->last_skill_ob [s])
813	if (skill->stats.exp != ns->last_skill_exp [s])	782	if (skill->stats.exp != ns->last_skill_exp [s])
814	{	783	{
815	ns->last_skill_exp [s] = skill->stats.exp;	784	ns->last_skill_exp [s] = skill->stats.exp;
816		785
817	/* Always send along the level if exp changes. This is only	786	/* Always send along the level if exp changes. This is only
…		…
825	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	794	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
826	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	795	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
827	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	796	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
828	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	797	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
829	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	798	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
830	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	799	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
831	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	800	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
832	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	801	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
833	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	802	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
834		803
835	flags = 0;	804	flags = 0;
836		805
837	if (pl->fire_on)	806	if (opl->fire_on)
838	flags |= SF_FIREON;	807	flags |= SF_FIREON;
839		808
840	if (pl->run_on)	809	if (opl->run_on)
841	flags |= SF_RUNON;	810	flags |= SF_RUNON;
842		811
843	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	812	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
844		813
845	if (ns->sc_version < 1025)	814	if (ns->sc_version < 1025)
…		…
859	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	828	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
860	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	829	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
861	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	830	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
862	}	831	}
863		832
864	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	833	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
865	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	834	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
866	set_title (ob, buf);	835	set_title (ob, buf);
867	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	836	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
868		837
869	/* Only send it away if we have some actual data */	838	/* Only send it away if we have some actual data */
…		…
873		842
874	/**	843	/**
875	* Tells the client that here is a player it should start using.	844	* Tells the client that here is a player it should start using.
876	*/	845	*/
877	void	846	void
878	esrv_new_player (player *pl, uint32 weight)	847	esrv_new_player (player *pl)
879	{	848	{
		849	sint32 weight = pl->ob->client_weight ();
		850
880	packet sl ("player");	851	packet sl ("player");
881		852
882	sl << uint32 (pl->ob->count)	853	sl << uint32 (pl->ob->count)
883	<< uint32 (weight)	854	<< uint32 (weight)
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.
…		…
951		921
952	if (!ns.faces_sent[face_num])	922	if (!ns.faces_sent[face_num])
953	if (ob)	923	if (ob)
954	ns.send_faces (ob);	924	ns.send_faces (ob);
955	else	925	else
956	ns.send_face (face_num);	926	ns.send_face (face_num, 10);
957		927
958	sl << uint16 (face_num);	928	sl << uint16 (face_num);
959	return 1;	929	return 1;
960	}	930	}
961		931
962	/* Nothing changed */	932	/* Nothing changed */
963	return 0;	933	return 0;
964	}
965
966	/**
967	* Returns the size of a data for a map square as returned by
968	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS 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	}	934	}
984		935
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)
…		…
1003	{	954	{
1004	prefetch_surrounding_maps (op->map, 3);	955	prefetch_surrounding_maps (op->map, 3);
1005	}	956	}
1006		957
1007	/**	958	/**
1008	* This function uses the new map1 protocol command to send the map	959	* Draws client map.
1009	* to the client. It is necessary because the old map command supports
1010	* a maximum map size of 15x15.
1011	* This function is much simpler than the old one. This is because
1012	* the old function optimized to send as few face identifiers as possible,
1013	* at the expense of sending more coordinate location (coordinates were
1014	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1015	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1016	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1017	* and use the other 4 bits for other informatiion. For full documentation
1018	* of what we send, see the doc/Protocol file.
1019	* I will describe internally what we do:
1020	* the ns->lastmap shows how the map last looked when sent to the client.
1021	* in the lastmap structure, there is a cells array, which is set to the
1022	* maximum viewable size (As set in config.h).
1023	* in the cells, there are faces and a count value.
1024	* we use the count value to hold the darkness value. If -1, then this space
1025	* is not viewable.
1026	* we use faces[0] faces[1] faces[2] to hold what the three layers
1027	* look like.
1028	*/	960	*/
1029	void	961	void
1030	draw_client_map1 (object *pl)	962	draw_client_map (player *pl)
1031	{	963	{
1032	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	964	object *ob = pl->observe;
1033	sint16 nx, ny;
1034	int estartlen, eoldlen;
1035	uint8 eentrysize;
1036	uint16 ewhatstart, ewhatflag;
1037	uint8 extendedinfos;
1038	maptile *m;
1039
1040	client &socket = *pl->contr->ns;
1041
1042	if (!pl->active)	965	if (!ob->active)
1043	return;	966	return;
1044
1045	check_map_change (pl->contr);
1046	prefetch_surrounding_maps (pl);
1047
1048	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1049	packet esl;
1050
1051	startlen = sl.length ();
1052
1053	/*Extendedmapinfo structure initialisation */
1054	if (socket.ext_mapinfos)
1055	{
1056	extendedinfos = EMI_NOREDRAW;
1057
1058	if (socket.EMI_smooth)
1059	extendedinfos |= EMI_SMOOTH;
1060
1061	ewhatstart = esl.length ();
1062	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1063	could need to be taken away */
1064	eentrysize = getExtendedMapInfoSize (&socket);
1065	esl << "mapextended "
1066	<< uint8 (extendedinfos)
1067	<< uint8 (eentrysize);
1068
1069	estartlen = esl.length ();
1070	}
1071
1072	/* x,y are the real map locations. ax, ay are viewport relative
1073	* locations.
1074	*/
1075	ay = 0;
1076
1077	/* We could do this logic as conditionals in the if statement,
1078	* but that started to get a bit messy to look at.
1079	*/
1080	max_x = pl->x + (socket.mapx + 1) / 2;
1081	max_y = pl->y + (socket.mapy + 1) / 2;
1082
1083	maptile *plmap = pl->map;
1084
1085	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1086	{
1087	ax = 0;
1088	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1089	{
1090	int emask, mask;
1091	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1092
1093	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1094
1095	/* If the coordinates are not valid, or it is too dark to see,
1096	* we tell the client as such
1097	*/
1098	nx = x;
1099	ny = y;
1100	m = get_map_from_coord (plmap, &nx, &ny);
1101
1102	if (!m)
1103	{
1104	/* space is out of map. Update space and clear values
1105	* if this hasn't already been done. If the space is out
1106	* of the map, it shouldn't have a head
1107	*/
1108	if (lastcell.count != -1)
1109	{
1110	sl << uint16 (mask);
1111	map_clearcell (&lastcell, -1);
1112	}
1113
1114	continue;
1115	}
1116
1117	m->touch ();
1118
1119	int d = pl->contr->blocked_los[ax][ay];
1120
1121	if (d > 3)
1122	{
1123
1124	int need_send = 0, count;
1125
1126	/* This block deals with spaces that are not visible for whatever
1127	* reason. Still may need to send the head for this space.
1128	*/
1129
1130	oldlen = sl.length ();
1131
1132	sl << uint16 (mask);
1133
1134	if (lastcell.count != -1)
1135	need_send = 1;
1136
1137	count = -1;
1138
1139	/* properly clear a previously sent big face */
1140	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1141	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1142	need_send = 1;
1143
1144	map_clearcell (&lastcell, count);
1145
1146	if ((mask & 0xf) || need_send)
1147	sl[oldlen + 1] = mask & 0xff;
1148	else
1149	sl.reset (oldlen);
1150	}
1151	else
1152	{
1153	/* In this block, the space is visible.
1154	*/
1155
1156	/* Rather than try to figure out what everything that we might
1157	* need to send is, then form the packet after that,
1158	* we presume that we will in fact form a packet, and update
1159	* the bits by what we do actually send. If we send nothing,
1160	* we just back out sl.length () to the old value, and no harm
1161	* is done.
1162	* I think this is simpler than doing a bunch of checks to see
1163	* what if anything we need to send, setting the bits, then
1164	* doing those checks again to add the real data.
1165	*/
1166	oldlen = sl.length ();
1167	eoldlen = esl.length ();
1168
1169	sl << uint16 (mask);
1170
1171	unsigned char dummy;
1172	unsigned char *last_ext = &dummy;
1173
1174	/* Darkness changed */
1175	if (lastcell.count != d && socket.darkness)
1176	{
1177	mask |= 0x8;
1178
1179	if (socket.extmap)
1180	{
1181	*last_ext |= 0x80;
1182	last_ext = &sl[sl.length ()];
1183	sl << uint8 (d);
1184	}
1185	else
1186	sl << uint8 (255 - 64 * d);
1187	}
1188
1189	lastcell.count = d;
1190
1191	mapspace &ms = m->at (nx, ny);
1192
1193	if (socket.extmap)
1194	{
1195	uint8 stat_hp = 0;
1196	uint8 stat_width = 0;
1197	uint8 flags = 0;
1198	UUID player = 0;
1199
1200	// send hp information, if applicable
1201	if (object *op = ms.faces_obj [0])
1202	{
1203	if (op->head || op->invisible)
1204	; // do not show
1205	else if (op->type == PLAYER
1206	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1207	{
1208	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1209	{
1210	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1211	stat_width = op->arch->tail_x;
1212	}
1213	}
1214
1215	if (op->msg && op->msg[0] == '@')
1216	flags |= 1;
1217
1218	if (op->type == PLAYER && op != pl)
1219	player = op->count;
1220	}
1221
1222	if (lastcell.stat_hp != stat_hp)
1223	{
1224	lastcell.stat_hp = stat_hp;
1225
1226	mask |= 0x8;
1227	*last_ext |= 0x80;
1228	last_ext = &sl[sl.length ()];
1229
1230	sl << uint8 (5) << uint8 (stat_hp);
1231
1232	if (stat_width > 1)
1233	{
1234	*last_ext |= 0x80;
1235	last_ext = &sl[sl.length ()];
1236
1237	sl << uint8 (6) << uint8 (stat_width);
1238	}
1239	}
1240
1241	if (lastcell.player != player)
1242	{
1243	lastcell.player = player;
1244
1245	mask |= 0x8;
1246	*last_ext |= 0x80;
1247	last_ext = &sl[sl.length ()];
1248
1249	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1250	}
1251
1252	if (lastcell.flags != flags)
1253	{
1254	lastcell.flags = flags;
1255
1256	mask |= 0x8;
1257	*last_ext |= 0x80;
1258	last_ext = &sl[sl.length ()];
1259
1260	sl << uint8 (8) << uint8 (flags);
1261	}
1262	}
1263
1264	/* Floor face */
1265	if (update_space (sl, socket, ms, lastcell, 2))
1266	mask |= 0x4;
1267
1268	/* Middle face */
1269	if (update_space (sl, socket, ms, lastcell, 1))
1270	mask |= 0x2;
1271
1272	if (ms.player () == pl
1273	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1274	{
1275	// force player to be visible to himself if invisible
1276	if (lastcell.faces[0] != pl->face)
1277	{
1278	lastcell.faces[0] = pl->face;
1279
1280	mask |= 0x1;
1281	sl << uint16 (pl->face);
1282
1283	socket.send_faces (pl);
1284	}
1285	}
1286	/* Top face */
1287	else if (update_space (sl, socket, ms, lastcell, 0))
1288	mask |= 0x1;
1289
1290
1291	/* Check to see if we are in fact sending anything for this
1292	* space by checking the mask. If so, update the mask.
1293	* if not, reset the len to that from before adding the mask
1294	* value, so we don't send those bits.
1295	*/
1296	if (mask & 0xf)
1297	sl[oldlen + 1] = mask & 0xff;
1298	else
1299	sl.reset (oldlen);
1300
1301	if (socket.ext_mapinfos)
1302	esl << uint16 (emask);
1303
1304	if (socket.EMI_smooth)
1305	{
1306	for (int layer = 2+1; layer--; )
1307	{
1308	object *ob = ms.faces_obj [layer];
1309
1310	// If there is no object for this space, or if the face for the object
1311	// is the blank face, set the smoothlevel to zero.
1312	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1313
1314	// We've gotten what face we want to use for the object. Now see if
1315	// if it has changed since we last sent it to the client.
1316	if (lastcell.smooth[layer] != smoothlevel)
1317	{
1318	lastcell.smooth[layer] = smoothlevel;
1319	esl << uint8 (smoothlevel);
1320	emask |= 1 << layer;
1321	}
1322	}
1323
1324	if (emask & 0xf)
1325	esl[eoldlen + 1] = emask & 0xff;
1326	else
1327	esl.reset (eoldlen);
1328	}
1329	} /* else this is a viewable space */
1330	} /* for x loop */
1331	} /* for y loop */
1332
1333	socket.flush_fx ();
1334
1335	/* Verify that we in fact do need to send this */
1336	if (socket.ext_mapinfos)
1337	{
1338	if (!(sl.length () > startlen || socket.sent_scroll))
1339	{
1340	/* No map data will follow, so don't say the client
1341	* it doesn't need draw!
1342	*/
1343	ewhatflag &= ~EMI_NOREDRAW;
1344	esl[ewhatstart + 1] = ewhatflag & 0xff;
1345	}
1346
1347	if (esl.length () > estartlen)
1348	socket.send_packet (esl);
1349	}
1350
1351	if (sl.length () > startlen || socket.sent_scroll)
1352	{
1353	socket.send_packet (sl);
1354	socket.sent_scroll = 0;
1355	}
1356	}
1357
1358	/**
1359	* Draws client map.
1360	*/
1361	void
1362	draw_client_map (object *pl)
1363	{
1364	int i, j;
1365	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1366	int mflags;
1367	struct Map newmap;
1368	maptile *m, *pm;
1369
1370	if (pl->type != PLAYER)
1371	{
1372	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1373	return;
1374	}
1375
1376	pm = pl->map;
1377		967
1378	/* 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
1379	* 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
1380	* be OK once they really log in.	970	* be OK once they really log in.
1381	*/	971	*/
1382	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	972	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1383	return;	973	return;
1384		974
1385	memset (&newmap, 0, sizeof (struct Map));	975	int startlen, oldlen;
1386		976
1387	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)	977	check_map_change (pl);
1388	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)	978	prefetch_surrounding_maps (pl->ob);
		979
		980	/* do LOS after calls to update_position */
		981	/* unfortunately, we need to udpate los when observing, currently */
		982	if (pl->do_los || pl->observe != pl->ob)
		983	{
		984	pl->do_los = 0;
		985	pl->update_los ();
		986	}
		987
		988	/**
		989	* This function uses the new map1 protocol command to send the map
		990	* to the client. It is necessary because the old map command supports
		991	* a maximum map size of 15x15.
		992	* This function is much simpler than the old one. This is because
		993	* the old function optimized to send as few face identifiers as possible,
		994	* at the expense of sending more coordinate location (coordinates were
		995	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		996	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		997	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		998	* and use the other 4 bits for other informatiion. For full documentation
		999	* of what we send, see the doc/Protocol file.
		1000	* I will describe internally what we do:
		1001	* the ns->lastmap shows how the map last looked when sent to the client.
		1002	* in the lastmap structure, there is a cells array, which is set to the
		1003	* maximum viewable size (As set in config.h).
		1004	* in the cells, there are faces and a count value.
		1005	* we use the count value to hold the darkness value. If -1, then this space
		1006	* is not viewable.
		1007	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1008	* look like.
		1009	*/
		1010
		1011	client &socket = *pl->ns;
		1012
		1013	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
		1014
		1015	startlen = sl.length ();
		1016
		1017	int hx = socket.mapx / 2;
		1018	int hy = socket.mapy / 2;
		1019
		1020	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
		1021	int ax = dx + hx;
		1022	int ay = dy + hy;
		1023
		1024	int mask = (ax << 10) | (ay << 4);
		1025	MapCell &lastcell = socket.lastmap.cells[ax][ay];
		1026
		1027	/* If the coordinates are not valid, or it is too dark to see,
		1028	* we tell the client as such
		1029	*/
		1030	if (!m)
1389	{	1031	{
1390	ax = i;	1032	/* space is out of map. Update space and clear values
1391	ay = j;	1033	* if this hasn't already been done. If the space is out
1392	m = pm;	1034	* of the map, it shouldn't have a head.
1393	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1394
1395	if (mflags & P_OUT_OF_MAP)
1396	continue;
1397
1398	/* If a map is visible to the player, we don't want to swap it out
1399	* just to reload it. This should really call something like
1400	* swap_map, but this is much more efficient and 'good enough'
1401	*/	1035	*/
1402	if (mflags & P_NEW_MAP)	1036	if (lastcell.count != -1)
1403	m->timeout = 50;	1037	{
		1038	sl << uint16 (mask);
		1039	map_clearcell (&lastcell, -1);
		1040	}
		1041
		1042	continue;
1404	}	1043	}
		1044
		1045	int d = pl->blocked_los_uc (dx, dy);
1405		1046
1406	/* do LOS after calls to update_position */	1047	if (d > 3)
1407	if (pl->contr->do_los)
1408	{	1048	{
1409	update_los (pl);	1049	/* This block deals with spaces that are not visible for whatever
1410	pl->contr->do_los = 0;	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);
1411	}	1063	}
		1064	else
		1065	{
		1066	/* In this block, the space is visible.
		1067	*/
1412		1068
1413	/* Big maps need a different drawing mechanism to work */	1069	/* Rather than try to figure out what everything that we might
1414	draw_client_map1 (pl);	1070	* need to send is, then form the packet after that,
1415	}	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 ();
1416		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)
		1116	{
		1117	if (op->stats.maxhp > op->stats.hp
		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;
		1136	}
		1137
		1138	if (expect_false (lastcell.stat_hp != stat_hp))
		1139	{
		1140	lastcell.stat_hp = stat_hp;
		1141
		1142	mask |= 0x8;
		1143	*last_ext |= 0x80;
		1144	last_ext = &sl[sl.length ()];
		1145
		1146	sl << uint8 (5) << uint8 (stat_hp);
		1147
		1148	if (stat_width > 1)
		1149	{
		1150	*last_ext |= 0x80;
		1151	last_ext = &sl[sl.length ()];
		1152
		1153	sl << uint8 (6) << uint8 (stat_width);
		1154	}
		1155	}
		1156
		1157	if (expect_false (lastcell.player != player))
		1158	{
		1159	lastcell.player = player;
		1160
		1161	mask |= 0x8;
		1162	*last_ext |= 0x80;
		1163	last_ext = &sl[sl.length ()];
		1164
		1165	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
		1166	}
		1167
		1168	if (expect_false (lastcell.flags != flags))
		1169	{
		1170	lastcell.flags = flags;
		1171
		1172	mask |= 0x8;
		1173	*last_ext |= 0x80;
		1174	last_ext = &sl[sl.length ()];
		1175
		1176	sl << uint8 (8) << uint8 (flags);
		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	{
		1192	// force player to be visible to himself if invisible
		1193	if (lastcell.faces[0] != ob->face)
		1194	{
		1195	lastcell.faces[0] = ob->face;
		1196
		1197	mask |= 0x1;
		1198	sl << uint16 (ob->face);
		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
		1207	/* Check to see if we are in fact sending anything for this
		1208	* space by checking the mask. If so, update the mask.
		1209	* if not, reset the len to that from before adding the mask
		1210	* value, so we don't send those bits.
		1211	*/
		1212	if (mask & 0xf)
		1213	sl[oldlen + 1] = mask & 0xff;
		1214	else
		1215	sl.reset (oldlen);
		1216	} /* else this is a viewable space */
		1217	ordered_mapwalk_end
		1218
		1219	socket.flush_fx ();
		1220
		1221	if (sl.length () > startlen || socket.sent_scroll)
		1222	{
		1223	socket.send_packet (sl);
		1224	socket.sent_scroll = 0;
		1225	}
		1226	}
1417		1227
1418	/*****************************************************************************/	1228	/*****************************************************************************/
1419
1420	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1229	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1421
1422	/* a player. Of course, the client need to know the command to be able to */	1230	/* a player. Of course, the client need to know the command to be able to */
1423
1424	/* manage it ! */	1231	/* manage it ! */
1425
1426	/*****************************************************************************/	1232	/*****************************************************************************/
1427	void	1233	void
1428	send_plugin_custom_message (object *pl, char *buf)	1234	send_plugin_custom_message (object *pl, char *buf)
1429	{	1235	{
1430	pl->contr->ns->send_packet (buf);	1236	pl->contr->ns->send_packet (buf);
…		…
1439	{	1245	{
1440	packet sl;	1246	packet sl;
1441	sl << "replyinfo skill_info\n";	1247	sl << "replyinfo skill_info\n";
1442		1248
1443	for (int i = 1; i < NUM_SKILLS; i++)	1249	for (int i = 1; i < NUM_SKILLS; i++)
1444	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]);
1445		1251
1446	if (sl.length () >= MAXSOCKBUF)	1252	if (sl.length () > MAXSOCKBUF)
1447	{	1253	{
1448	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1254	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1449	fatal (0);	1255	fatal (0);
1450	}	1256	}
1451		1257
…		…
1464	sl << "replyinfo spell_paths\n";	1270	sl << "replyinfo spell_paths\n";
1465		1271
1466	for (int i = 0; i < NRSPELLPATHS; i++)	1272	for (int i = 0; i < NRSPELLPATHS; i++)
1467	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1273	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1468		1274
1469	if (sl.length () >= MAXSOCKBUF)	1275	if (sl.length () > MAXSOCKBUF)
1470	{	1276	{
1471	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1277	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1472	fatal (0);	1278	fatal (0);
1473	}	1279	}
1474		1280
…		…
1493	if (spell->type == SPELL)	1299	if (spell->type == SPELL)
1494	{	1300	{
1495	int flags = 0;	1301	int flags = 0;
1496		1302
1497	/* check if we need to update it */	1303	/* check if we need to update it */
1498	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))
1499	{	1305	{
1500	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);
1501	flags |= UPD_SP_MANA;	1307	flags |= UPD_SP_MANA;
1502	}	1308	}
1503		1309
1504	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))
1505	{	1311	{
1506	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);
1507	flags |= UPD_SP_GRACE;	1313	flags |= UPD_SP_GRACE;
1508	}	1314	}
1509		1315
1510	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))
1511	{	1317	{
1512	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);
1513	flags |= UPD_SP_DAMAGE;	1319	flags |= UPD_SP_DAMAGE;
1514	}	1320	}
1515		1321
1516	if (flags)	1322	if (flags)
1517	{	1323	{
…		…
1519		1325
1520	sl << "updspell "	1326	sl << "updspell "
1521	<< uint8 (flags)	1327	<< uint8 (flags)
1522	<< uint32 (spell->count);	1328	<< uint32 (spell->count);
1523		1329
1524	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1330	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1525	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1331	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1526	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1332	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1527		1333
1528	pl->ns->send_packet (sl);	1334	pl->ns->send_packet (sl);
1529	}	1335	}
1530	}	1336	}
1531	}	1337	}
…		…
1561	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);
1562	return;	1368	return;
1563	}	1369	}
1564		1370
1565	/* 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 */
1566	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);
1567	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);
1568	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);
1569		1375
1570	/* figure out which skill it uses, if it uses one */	1376	/* figure out which skill it uses, if it uses one */
1571	if (spell->skill)	1377	if (spell->skill)
1572	{	1378	if (object *tmp = pl->find_skill (spell->skill))
1573	for (i = 1; i < NUM_SKILLS; i++)
1574	if (!strcmp (spell->skill, skill_names[i]))
1575	{
1576	skill = i + CS_STAT_SKILLINFO;	1379	skill = tmp->subtype + CS_STAT_SKILLINFO;
1577	break;
1578	}
1579	}
1580		1380
1581	// spells better have a face	1381	// spells better have a face
1582	if (!spell->face)	1382	if (!spell->face)
1583	{	1383	{
1584	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);
1585	spell->face = face_find ("burnout.x11", blank_face);	1385	spell->face = face_find ("burnout.x11", blank_face);
1586	}	1386	}
		1387
		1388	pl->ns->send_face (spell->face);
1587		1389
1588	/* send the current values */	1390	/* send the current values */
1589	sl << uint32 (spell->count)	1391	sl << uint32 (spell->count)
1590	<< uint16 (spell->level)	1392	<< uint16 (spell->level)
1591	<< uint16 (spell->casting_time)	1393	<< uint16 (spell->casting_time)
1592	<< uint16 (spell->last_sp)	1394	<< uint16 (spell->cached_sp)
1593	<< uint16 (spell->last_grace)	1395	<< uint16 (spell->cached_grace)
1594	<< uint16 (spell->last_eat)	1396	<< uint16 (spell->cached_eat)
1595	<< uint8 (skill)	1397	<< uint8 (skill)
1596	<< uint32 (spell->path_attuned)	1398	<< uint32 (spell->path_attuned)
1597	<< uint32 (spell->face)	1399	<< uint32 (spell->face)
1598	<< data8 (spell->name)	1400	<< data8 (spell->name)
1599	<< data16 (spell->msg);	1401	<< data16 (spell->msg);
…		…
1627	* bytes and 3 strings (because that is the spec) so we need to	1429	* bytes and 3 strings (because that is the spec) so we need to
1628	* check that the length of those 3 strings, plus the 23 bytes,	1430	* check that the length of those 3 strings, plus the 23 bytes,
1629	* won't take us over the length limit for the socket, if it does,	1431	* won't take us over the length limit for the socket, if it does,
1630	* we need to send what we already have, and restart packet formation	1432	* we need to send what we already have, and restart packet formation
1631	*/	1433	*/
		1434	if (spell->type != SPELL)
		1435	continue;
		1436
1632	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1437	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1633	* to show add_spell is 26 bytes + 2 strings. However, the overun	1438	* to show add_spell is 26 bytes + 2 strings. However, the overun
1634	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1439	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1635	* like it will fix this	1440	* like it will fix this
1636	*/	1441	*/
1637	if (spell->type != SPELL)
1638	continue;
1639
1640	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1442	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1641	{	1443	{
		1444	pl->ns->flush_fx ();
1642	pl->ns->send_packet (sl);	1445	pl->ns->send_packet (sl);
1643		1446
1644	sl.reset ();	1447	sl.reset ();
1645	sl << "addspell ";	1448	sl << "addspell ";
1646	}	1449	}
…		…
1654	return;	1457	return;
1655	}	1458	}
1656	else	1459	else
1657	append_spell (pl, sl, spell);	1460	append_spell (pl, sl, spell);
1658		1461
1659	if (sl.length () >= MAXSOCKBUF)	1462	if (sl.length () > MAXSOCKBUF)
1660	{	1463	{
1661	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1464	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1662	fatal (0);	1465	fatal (0);
1663	}	1466	}
1664		1467
1665	/* finally, we can send the packet */	1468	/* finally, we can send the packet */
		1469	pl->ns->flush_fx ();
1666	pl->ns->send_packet (sl);	1470	pl->ns->send_packet (sl);
1667	}	1471	}
1668		1472

Diff Legend

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