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.50 by root, Thu Dec 21 23:37:06 2006 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The author can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/**	24	/**
25	* \file	25	* \file
26	* Client handling.	26	* Client handling.
27	*	27	*
…		…
35	* have the prototype of (char *data, int datalen, int client_num). This	35	* have the prototype of (char *data, int datalen, int client_num). This
36	* way, we can use one dispatch table.	36	* way, we can use one dispatch table.
37	*	37	*
38	* esrv_map_new starts updating the map	38	* esrv_map_new starts updating the map
39	*	39	*
40	* esrv_map_setbelow allows filling in all of the faces for the map.
41	* if a face has not already been sent to the client, it is sent now.
42	*
43	*/	40	*/
44		41
45	#include <global.h>	42	#include <global.h>
46	#include <sproto.h>	43	#include <sproto.h>
47		44
…		…
100	* that much difference in bandwidth.	97	* that much difference in bandwidth.
101	*/	98	*/
102	mx = ns->mapx;	99	mx = ns->mapx;
103	my = ns->mapy;	100	my = ns->mapy;
104		101
105	if (ns->mapmode == Map1aCmd)
106	{
107	mx += MAX_HEAD_OFFSET;
108	my += MAX_HEAD_OFFSET;
109	}
110
111	/* 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
112	* (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,
113	* if the destination x or y coordinate is outside the viewable	104	* if the destination x or y coordinate is outside the viewable
114	* area, we clear the values - otherwise, the old values	105	* area, we clear the values - otherwise, the old values
115	* 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.
116	*/	107	*/
117	for (x = 0; x < mx; x++)	108	for (x = 0; x < mx; x++)
118	{
119	for (y = 0; y < my; y++)	109	for (y = 0; y < my; y++)
120	{
121	if (x >= ns->mapx || y >= ns->mapy)	110	if (x >= ns->mapx || y >= ns->mapy)
122	/* clear cells outside the viewable area */	111	/* clear cells outside the viewable area */
123	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	112	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
124	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)
125	/* clear newly visible tiles within the viewable area */	114	/* clear newly visible tiles within the viewable area */
126	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	115	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
127	else	116	else
128	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));
129	}
130	}
131		118
132	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	119	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
133		120
134	/* 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
135	* empty).	122	* empty).
…		…
138	}	125	}
139		126
140	static void	127	static void
141	clear_map (player *pl)	128	clear_map (player *pl)
142	{	129	{
		130	pl->ns->mapinfo_queue_clear ();
		131
143	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	132	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
		133
		134	pl->ns->force_newmap = false;
144		135
145	if (pl->ns->newmapcmd == 1)	136	if (pl->ns->newmapcmd == 1)
146	pl->ns->send_packet ("newmap");	137	pl->ns->send_packet ("newmap");
147		138
148	pl->ns->floorbox_reset ();	139	pl->ns->floorbox_reset ();
149	}	140	}
150		141
		142	static void
		143	send_map_info (player *pl)
		144	{
		145	client &socket = *pl->ns;
		146	object *ob = pl->observe;
		147
		148	if (socket.mapinfocmd)
		149	{
		150	if (ob->map && ob->map->path[0])
		151	{
		152	int flags = 0;
		153
		154	if (ob->map->tile_path[0]) flags |= 1;
		155	if (ob->map->tile_path[1]) flags |= 2;
		156	if (ob->map->tile_path[2]) flags |= 4;
		157	if (ob->map->tile_path[3]) flags |= 8;
		158
		159	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		160	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		161	ob->map->width, ob->map->height, &ob->map->path);
		162	}
		163	else
		164	socket.send_packet ("mapinfo current");
		165	}
		166	}
		167
151	/** check for map change and send new map data */	168	/** check for map/region change and send new map data */
152	static void	169	static void
153	check_map_change (player *pl)	170	check_map_change (player *pl)
154	{	171	{
155	client &socket = *pl->ns;	172	client &socket = *pl->ns;
156	object *ob = pl->ob;	173	object *ob = pl->observe;
157	char buf[MAX_BUF]; /* eauugggh */
158		174
159	if (socket.current_map != ob->map)	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;
160	{	180	}
		181
		182	// first try to aovid a full newmap on tiled map scrolls
		183	if (socket.current_map != ob->map && !socket.force_newmap)
		184	{
		185	rv_vector rv;
		186
		187	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		188
		189	// manhattan distance is very handy here
		190	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		191	{
		192	socket.current_map = ob->map;
		193	socket.current_x = ob->x;
		194	socket.current_y = ob->y;
		195
		196	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		197	socket.floorbox_reset ();
		198	send_map_info (pl);
		199	}
		200	}
		201
		202	if (socket.current_map != ob->map || socket.force_newmap)
		203	{
		204	clear_map (pl);
161	socket.current_map = ob->map;	205	socket.current_map = ob->map;
162		206	send_map_info (pl);
163	clear_map (pl);
164
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;
…		…
208	* RequestInfo is sort of a meta command. There is some specific	227	* RequestInfo is sort of a meta command. There is some specific
209	* request of information, but we call other functions to provide	228	* request of information, but we call other functions to provide
210	* that information.	229	* that information.
211	*/	230	*/
212	void	231	void
213	RequestInfo (char *buf, int len, client * ns)	232	RequestInfo (char *buf, int len, client *ns)
214	{	233	{
215	char *params = NULL, *cp;	234	char *params;
216
217	/* No match */
218	char bigbuf[MAX_BUF];
219	int slen;
220
221	/* Set up replyinfo before we modify any of the buffers - this is used
222	* if we don't find a match.
223	*/
224	strcpy (bigbuf, "replyinfo ");
225	slen = strlen (bigbuf);
226	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227		235
228	/* find the first space, make it null, and update the	236	/* find the first space, make it null, and update the
229	* params pointer.	237	* params pointer.
230	*/	238	*/
231	for (cp = buf; *cp != '\0'; cp++)	239	for (params = buf; *params; params++)
232	if (*cp == ' ')	240	if (*params == ' ')
233	{	241	{
234	*cp = '\0';
235	params = cp + 1;	242	*params++ = 0;
236	break;	243	break;
237	}	244	}
238		245
239	if (!strcmp (buf, "image_info"))	246	if (!strcmp (buf, "image_info"))
240	send_image_info (ns, params);	247	send_image_info (ns, params);
…		…
243	else if (!strcmp (buf, "skill_info"))	250	else if (!strcmp (buf, "skill_info"))
244	send_skill_info (ns, params);	251	send_skill_info (ns, params);
245	else if (!strcmp (buf, "spell_paths"))	252	else if (!strcmp (buf, "spell_paths"))
246	send_spell_paths (ns, params);	253	send_spell_paths (ns, params);
247	else	254	else
248	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	}
249	}	262	}
250		263
251	void	264	void
252	ExtCmd (char *buf, int len, player *pl)	265	ExtCmd (char *buf, int len, player *pl)
253	{	266	{
…		…
256		269
257	void	270	void
258	ExtiCmd (char *buf, int len, client *ns)	271	ExtiCmd (char *buf, int len, client *ns)
259	{	272	{
260	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;
261	}	360	}
262		361
263	void	362	void
264	MapInfoCmd (char *buf, int len, player *pl)	363	MapInfoCmd (char *buf, int len, player *pl)
265	{	364	{
266	// <mapinfo tag spatial tile-path	365	// <mapinfo tag spatial tile-path
267	// >mapinfo tag spatial flags x y w h hash	366	// >mapinfo tag spatial flags x y w h hash
268		367
269	char bigbuf[MAX_BUF], *token;
270
271	token = buf;	368	char *token = buf;
272	// copy token	369
273	if (!(buf = strchr (buf, ' ')))	370	if (!(buf = strchr (buf, ' ')))
274	return;	371	return;
275		372
276	*buf++ = 0;
277
278	if (!strncmp (buf, "spatial ", 8))	373	if (!strncmp (buf, " spatial ", 9))
279	{	374	{
280	buf += 8;	375	char *copy = strdup (token);
		376	copy [buf - token] = 0;
281		377
282	// initial map and its origin	378	#if 0
283	maptile *map = pl->ob->map;	379	// this makes only sense when we flush the buffer immediately
284	sint16 dx, dy;	380	if (pl->ns->mapinfo_try (copy))
285	int mapx = pl->ns->mapx / 2 - pl->ob->x;	381	free (copy);
286	int mapy = pl->ns->mapy / 2 - pl->ob->y;
287	int max_distance = 8; // limit maximum path length to something generous
288
289	while (*buf && map && max_distance)
290	{
291	int dir = *buf++;
292
293	switch (dir)
294	{
295	case '1':
296	dx = 0;
297	dy = -1;
298	map = get_map_from_coord (map, &dx, &dy);
299	map && (mapy -= map->height);
300	break;
301	case '2':
302	mapx += map->width;
303	dx = map->width;
304	dy = 0;
305	map = get_map_from_coord (map, &dx, &dy);
306	break;
307	case '3':
308	mapy += map->height;
309	dx = 0;
310	dy = map->height;
311	map = get_map_from_coord (map, &dx, &dy);
312	break;
313	case '4':
314	dx = -1;
315	dy = 0;
316	map = get_map_from_coord (map, &dx, &dy);
317	map && (mapx -= map->width);
318	break;
319	}
320
321	--max_distance;
322	}
323
324	if (!max_distance)
325	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326	else if (map && map->path[0])
327	{
328	int flags = 0;
329
330	if (map->tile_path[0])
331	flags |= 1;
332	if (map->tile_path[1])
333	flags |= 2;
334	if (map->tile_path[2])
335	flags |= 4;
336	if (map->tile_path[3])
337	flags |= 8;
338
339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);
340	}
341	else	382	else
342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	383	#endif
		384	pl->ns->mapinfo_queue.push_back (copy);
343	}	385	}
344	else	386	else
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	387	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347	pl->ns->send_packet (bigbuf);
348	}	388	}
349		389
350	/** This is the Setup cmd - easy first implementation */	390	/** This is the Setup cmd */
351	void	391	void
352	SetUp (char *buf, int len, client * ns)	392	SetUp (char *buf, int len, client * ns)
353	{	393	{
354	int s, slen;	394	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
355	char *cmd, *param, cmdback[HUGE_BUF];
356
357	/* run through the cmds of setup
358	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
359	*
360	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
361	* The client then must sort this out
362	*/
363
364	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
365
366	strcpy (cmdback, "setup");
367	for (s = 0; s < len; )
368	{
369	cmd = &buf[s];
370
371	/* find the next space, and put a null there */
372	for (; buf[s] && buf[s] != ' '; s++)
373	;
374
375	buf[s++] = 0;
376
377	while (buf[s] == ' ')
378	s++;
379
380	if (s >= len)
381	break;
382
383	param = &buf[s];
384
385	for (; buf[s] && buf[s] != ' '; s++)
386	;
387
388	buf[s++] = 0;
389
390	while (buf[s] == ' ')
391	s++;
392
393	slen = strlen (cmdback);
394	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
395	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
396	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
397
398	if (!strcmp (cmd, "sound"))
399	{
400	ns->sound = atoi (param);
401	safe_strcat (cmdback, param, &slen, HUGE_BUF);
402	}
403	else if (!strcmp (cmd, "exp64"))
404	{
405	ns->exp64 = atoi (param);
406	safe_strcat (cmdback, param, &slen, HUGE_BUF);
407	}
408	else if (!strcmp (cmd, "spellmon"))
409	{
410	ns->monitor_spells = atoi (param);
411	safe_strcat (cmdback, param, &slen, HUGE_BUF);
412	}
413	else if (!strcmp (cmd, "darkness"))
414	{
415	ns->darkness = atoi (param);
416	safe_strcat (cmdback, param, &slen, HUGE_BUF);
417	}
418	else if (!strcmp (cmd, "map1cmd"))
419	{
420	if (atoi (param))
421	ns->mapmode = Map1Cmd;
422	/* if beyond this size, need to use map1cmd no matter what */
423	if (ns->mapx > 11 || ns->mapy > 11)
424	ns->mapmode = Map1Cmd;
425	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
426	}
427	else if (!strcmp (cmd, "map1acmd"))
428	{
429	if (atoi (param))
430	ns->mapmode = Map1aCmd;
431	/* if beyond this size, need to use map1acmd no matter what */
432	if (ns->mapx > 11 || ns->mapy > 11)
433	ns->mapmode = Map1aCmd;
434	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
435	}
436	else if (!strcmp (cmd, "newmapcmd"))
437	{
438	ns->newmapcmd = atoi (param);
439	safe_strcat (cmdback, param, &slen, HUGE_BUF);
440	// } else if (!strcmp(cmd,"plugincmd")) {
441	// ns->plugincmd = atoi(param);
442	// safe_strcat(cmdback, param, &slen, HUGE_BUF);
443	}
444	else if (!strcmp (cmd, "mapinfocmd"))
445	{
446	ns->mapinfocmd = atoi (param);
447	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
448	}
449	else if (!strcmp (cmd, "extcmd"))
450	{
451	ns->extcmd = atoi (param);
452	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
453	}
454	else if (!strcmp (cmd, "extmap"))
455	{
456	ns->extmap = atoi (param);
457	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
458	}
459	else if (!strcmp (cmd, "facecache"))
460	{
461	ns->facecache = atoi (param);
462	safe_strcat (cmdback, param, &slen, HUGE_BUF);
463	}
464	else if (!strcmp (cmd, "faceset"))
465	{
466	char tmpbuf[20];
467	int q = atoi (param);
468
469	if (is_valid_faceset (q))
470	ns->faceset = q;
471	sprintf (tmpbuf, "%d", ns->faceset);
472	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
473	/* if the client is using faceset, it knows about image2 command */
474	ns->image2 = 1;
475	}
476	else if (!strcmp (cmd, "itemcmd"))
477	{
478	/* Version of the item protocol command to use. Currently,
479	* only supported versions are 1 and 2. Using a numeric
480	* value will make it very easy to extend this in the future.
481	*/
482	char tmpbuf[20];
483	int q = atoi (param);
484
485	if (q < 1 || q > 2)
486	{
487	strcpy (tmpbuf, "FALSE");
488	}
489	else
490	{
491	ns->itemcmd = q;
492	sprintf (tmpbuf, "%d", ns->itemcmd);
493	}
494	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
495	}
496	else if (!strcmp (cmd, "mapsize"))
497	{
498	int x, y = 0;
499	char tmpbuf[MAX_BUF], *cp;
500
501	x = atoi (param);
502	for (cp = param; *cp != 0; cp++)
503	if (*cp == 'x' || *cp == 'X')
504	{
505	y = atoi (cp + 1);
506	break;
507	}
508	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
509	{
510	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
511	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
512	}
513	else
514	{
515	ns->mapx = x;
516	ns->mapy = y;
517	/* better to send back what we are really using and not the
518	* param as given to us in case it gets parsed differently.
519	*/
520	sprintf (tmpbuf, "%dx%d", x, y);
521	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
522	/* If beyond this size and still using orig map command, need to
523	* go to map1cmd.
524	*/
525	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
526	ns->mapmode = Map1Cmd;
527	}
528	}
529	else if (!strcmp (cmd, "extendedMapInfos"))
530	{
531	/* Added by tchize
532	* prepare to use the mapextended command
533	*/
534	char tmpbuf[20];
535
536	ns->ext_mapinfos = (atoi (param));
537	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
538	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
539	}
540	else if (!strcmp (cmd, "extendedTextInfos"))
541	{
542	/* Added by tchize
543	* prepare to use the extended text commands
544	* Client toggle this to non zero to get exttext
545	*/
546	char tmpbuf[20];
547
548	ns->has_readable_type = (atoi (param));
549	sprintf (tmpbuf, "%d", ns->has_readable_type);
550	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
551	}
552	else
553	{
554	/* Didn't get a setup command we understood -
555	* report a failure to the client.
556	*/
557	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
558	}
559	} /* for processing all the setup commands */
560
561	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
562	ns->send_packet (cmdback);
563	}	395	}
564		396
565	/**	397	/**
566	* The client has requested to be added to the game.	398	* The client has requested to be added to the game.
567	* This is what takes care of it. We tell the client how things worked out.	399	* This is what takes care of it. We tell the client how things worked out.
568	* I am not sure if this file is the best place for this function. however,	400	* I am not sure if this file is the best place for this function. however,
569	* it either has to be here or init_sockets needs to be exported.	401	* it either has to be here or init_sockets needs to be exported.
570	*/	402	*/
571	void	403	void
572	AddMeCmd (char *buf, int len, client * ns)	404	AddMeCmd (char *buf, int len, client *ns)
573	{	405	{
574	if (INVOKE_CLIENT (ADDME, ns))	406	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575	return;
576
577	if (ns->pl || add_player (ns))
578	ns->send_packet ("addme_failed");
579	else
580	ns->send_packet ("addme_success");
581	}	407	}
582		408
583	/** Reply to ExtendedInfos command */	409	/** Reply to ExtendedInfos command */
584	void	410	void
585	ToggleExtendedInfos (char *buf, int len, client * ns)	411	ToggleExtendedInfos (char *buf, int len, client * ns)
…		…
695		521
696	ns->send_packet (cmdback);	522	ns->send_packet (cmdback);
697	}	523	}
698		524
699	/**	525	/**
700	* A lot like the old AskSmooth (in fact, now called by AskSmooth).
701	* Basically, it makes no sense to wait for the client to request a
702	* a piece of data from us that we know the client wants. So
703	* if we know the client wants it, might as well push it to the
704	* client.
705	*/
706	static void
707	SendSmooth (client *ns, uint16 face)
708	{
709	uint16 smoothface;
710
711	/* If we can't find a face, return and set it so we won't try to send this
712	* again.
713	*/
714	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
715	{
716
717	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
718	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
719	return;
720	}
721
722	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
723	esrv_send_face (ns, smoothface, 0);
724
725	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
726
727	packet sl ("smooth");
728
729	sl << uint16 (face)
730	<< uint16 (smoothface);
731
732	ns->send_packet (sl);
733	}
734
735	/**
736	* Tells client the picture it has to use
737	* to smooth a picture number given as argument.
738	*/
739	void
740	AskSmooth (char *buf, int len, client *ns)
741	{
742	SendSmooth (ns, atoi (buf));
743	}
744
745	/**
746	* 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,
747	* etc.)	527	* etc.)
748	*/	528	*/
749	void	529	void
750	PlayerCmd (char *buf, int len, player *pl)	530	PlayerCmd (char *buf, int len, player *pl)
…		…
771	* commands.	551	* commands.
772	*/	552	*/
773	pl->count = 0;	553	pl->count = 0;
774	}	554	}
775		555
776
777	/**	556	/**
778	* 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,
779	* 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
780	* '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
781	* can throttle.	560	* can throttle.
…		…
783	void	562	void
784	NewPlayerCmd (char *buf, int len, player *pl)	563	NewPlayerCmd (char *buf, int len, player *pl)
785	{	564	{
786	if (len <= 6)	565	if (len <= 6)
787	{	566	{
788	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);
789	return;	568	return;
790	}	569	}
791		570
792	uint16 cmdid = net_uint16 ((uint8 *)buf);	571	uint16 cmdid = net_uint16 ((uint8 *)buf);
793	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	572	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
806	* commands.	585	* commands.
807	*/	586	*/
808	pl->count = 0;	587	pl->count = 0;
809		588
810	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	589	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
811	int time = FABS (pl->ob->speed) < 0.001	590	int time = fabs (pl->ob->speed) < 0.001
812	? time = MAX_TIME * 100	591	? time = MAX_TIME * 100
813	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	592	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
814		593
815	/* Send confirmation of command execution now */	594	/* Send confirmation of command execution now */
816	packet sl ("comc");	595	packet sl ("comc");
817	sl << uint16 (cmdid) << uint32 (time);	596	sl << uint16 (cmdid) << uint32 (time);
818	pl->ns->send_packet (sl);	597	pl->ns->send_packet (sl);
…		…
850	{	629	{
851	case ST_PLAYING:	630	case ST_PLAYING:
852	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	631	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
853	break;	632	break;
854		633
855	case ST_PLAY_AGAIN:
856	/* We can check this for return value (2==quit). Maybe we
857	* should, and do something appropriate?
858	*/
859	receive_play_again (pl->ob, buf[0]);
860	break;
861
862	case ST_ROLL_STAT:
863	key_roll_stat (pl->ob, buf[0]);
864	break;
865
866	case ST_CHANGE_CLASS:
867	key_change_class (pl->ob, buf[0]);
868	break;
869
870	case ST_CONFIRM_QUIT:
871	key_confirm_quit (pl->ob, buf[0]);
872	break;
873
874	case ST_CONFIGURE:
875	LOG (llevError, "In client input handling, but into configure state\n");
876	ns->state = ST_PLAYING;
877	break;
878
879	case ST_GET_NAME:
880	receive_player_name (pl->ob, 13);
881	break;
882
883	case ST_GET_PASSWORD:
884	case ST_CONFIRM_PASSWORD:
885	receive_player_password (pl->ob, 13);
886	break;
887
888	case ST_GET_PARTY_PASSWORD: /* Get password for party */	634	case ST_GET_PARTY_PASSWORD: /* Get password for party */
889	receive_party_password (pl->ob, 13);	635	receive_party_password (pl->ob, 13);
890	break;	636	break;
891		637
892	default:	638	default:
…		…
913	ns->cs_version = atoi (buf);	659	ns->cs_version = atoi (buf);
914	ns->sc_version = ns->cs_version;	660	ns->sc_version = ns->cs_version;
915		661
916	LOG (llevDebug, "connection from client <%s>\n", buf);	662	LOG (llevDebug, "connection from client <%s>\n", buf);
917		663
918
919	//TODO: should log here just for statistics	664	//TODO: should log here just for statistics
920		665
921	//if (VERSION_CS != ns->cs_version)	666	//if (VERSION_CS != ns->cs_version)
922	// unchecked;	667	// unchecked;
923		668
…		…
932		677
933	cp = strchr (cp + 1, ' ');	678	cp = strchr (cp + 1, ' ');
934		679
935	if (cp)	680	if (cp)
936	{	681	{
937	assign (ns->version, cp + 1);	682	ns->version = cp + 1;
938		683
939	if (ns->sc_version < 1026)	684	if (ns->sc_version < 1026)
940	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	685	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
941	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	686	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
942	}	687	}
…		…
948	{	693	{
949	ns->sound = atoi (buf);	694	ns->sound = atoi (buf);
950	}	695	}
951		696
952	/** client wants the map resent */	697	/** client wants the map resent */
953
954	void	698	void
955	MapRedrawCmd (char *buf, int len, player *pl)	699	MapRedrawCmd (char *buf, int len, player *pl)
956	{	700	{
957	/* This function is currently disabled; just clearing the map state results in	701	/* This function is currently disabled; just clearing the map state results in
958	* display errors. It should clear the cache and send a newmap command.	702	* display errors. It should clear the cache and send a newmap command.
…		…
966	* syntax is: move (to) (tag) (nrof)	710	* syntax is: move (to) (tag) (nrof)
967	*/	711	*/
968	void	712	void
969	MoveCmd (char *buf, int len, player *pl)	713	MoveCmd (char *buf, int len, player *pl)
970	{	714	{
971	int vals[3], i;	715	int to, tag, nrof;
972		716
973	/* A little funky here. We only cycle for 2 records, because	717	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
974	* we obviously are not going to find a space after the third
975	* record. Perhaps we should just replace this with a
976	* sscanf?
977	*/
978	for (i = 0; i < 2; i++)
979	{	718	{
980	vals[i] = atoi (buf);
981
982	if (!(buf = strchr (buf, ' ')))
983	{
984	LOG (llevError, "Incomplete move command: %s\n", buf);	719	LOG (llevError, "Incomplete move command: %s\n", buf);
985	return;	720	return;
986	}
987
988	buf++;
989	}	721	}
990		722
991	vals[2] = atoi (buf);	723	esrv_move_object (pl->ob, to, tag, nrof);
992
993	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
994	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
995	}	724	}
996		725
997	/******************************************************************************	726	/******************************************************************************
998	*	727	*
999	* Start of commands the server sends to the client.	728	* Start of commands the server sends to the client.
…		…
1003	/**	732	/**
1004	* Asks the client to query the user. This way, the client knows	733	* Asks the client to query the user. This way, the client knows
1005	* it needs to send something back (vs just printing out a message)	734	* it needs to send something back (vs just printing out a message)
1006	*/	735	*/
1007	void	736	void
1008	send_query (client *ns, uint8 flags, char *text)	737	send_query (client *ns, uint8 flags, const char *text)
1009	{	738	{
1010	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	739	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
		740	}
		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);
1011	}	768	}
1012		769
1013	#define AddIfInt64(Old,New,Type) if (Old != New) {\	770	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1014	Old = New; \	771	Old = New; \
1015	sl << uint8 (Type) << uint64 (New); \	772	sl << uint8 (Type) << uint64 (New); \
…		…
1023	#define AddIfShort(Old,New,Type) if (Old != New) {\	780	#define AddIfShort(Old,New,Type) if (Old != New) {\
1024	Old = New; \	781	Old = New; \
1025	sl << uint8 (Type) << uint16 (New); \	782	sl << uint8 (Type) << uint16 (New); \
1026	}	783	}
1027		784
1028	#define AddIfFloat(Old,New,Type) if (Old != New) {\	785	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
1029	Old = New; \	786	Old = New; \
1030	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	787	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1031	}	788	}
1032		789
1033	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	790	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1034	free(Old); Old = strdup (New);\	791	free(Old); Old = strdup (New);\
1035	sl << uint8 (Type) << data8 (New); \	792	sl << uint8 (Type) << data8 (New); \
…		…
1045	esrv_update_stats (player *pl)	802	esrv_update_stats (player *pl)
1046	{	803	{
1047	char buf[MAX_BUF];	804	char buf[MAX_BUF];
1048	uint16 flags;	805	uint16 flags;
1049		806
		807	client *ns = pl->ns;
		808	if (!ns)
		809	return;
		810
		811	object *ob = pl->observe;
		812	if (!ob)
		813	return;
		814
		815	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
		816
1050	packet sl ("stats");	817	packet sl ("stats");
1051		818
1052	if (pl->ob)
1053	{
1054	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	819	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1055	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	820	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1056	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	821	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1057	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	822	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1058	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	823	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1059	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	824	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1060	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	825	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1061	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1062	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1063	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1064	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	826	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1065	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	827	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		828	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		829	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		830	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1066	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	831	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1067	}
1068		832
1069	if (pl->ns->exp64)
1070	for (int s = 0; s < NUM_SKILLS; s++)	833	for (int s = 0; s < NUM_SKILLS; s++)
1071	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	834	if (object *skill = opl->last_skill_ob [s])
		835	if (skill->stats.exp != ns->last_skill_exp [s])
1072	{	836	{
		837	ns->last_skill_exp [s] = skill->stats.exp;
		838
1073	/* Always send along the level if exp changes. This is only	839	/* Always send along the level if exp changes. This is only
1074	* 1 extra byte, but keeps processing simpler.	840	* 1 extra byte, but keeps processing simpler.
1075	*/	841	*/
1076	sl << uint8 (s + CS_STAT_SKILLINFO)	842	sl << uint8 (s + CS_STAT_SKILLINFO)
1077	<< uint8 (pl->last_skill_ob[s]->level)	843	<< uint8 (skill->level)
1078	<< uint64 (pl->last_skill_ob[s]->stats.exp);	844	<< uint64 (skill->stats.exp);
1079
1080	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1081	}	845	}
1082		846
1083	if (pl->ns->exp64)
1084	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	847	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1085	else
1086	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1087
1088	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	848	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1089	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	849	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1090	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	850	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1091	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	851	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1092	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	852	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1093	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	853	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1094	AddIfFloat (pl->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);
1095	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	855	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		856
1096	flags = 0;	857	flags = 0;
1097		858
1098	if (pl->fire_on)	859	if (opl->fire_on)
1099	flags |= SF_FIREON;	860	flags |= SF_FIREON;
1100		861
1101	if (pl->run_on)	862	if (opl->run_on)
1102	flags |= SF_RUNON;	863	flags |= SF_RUNON;
1103		864
1104	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	865	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1105		866
1106	if (pl->ns->sc_version < 1025)	867	if (ns->sc_version < 1025)
1107	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	868	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1108	else	869	else
1109	for (int i = 0; i < NROFATTACKS; i++)	870	for (int i = 0; i < NROFATTACKS; i++)
1110	{	871	{
1111	/* Skip ones we won't send */	872	/* Skip ones we won't send */
1112	if (atnr_cs_stat[i] == -1)	873	if (atnr_cs_stat[i] == -1)
1113	continue;	874	continue;
1114		875
1115	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	876	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1116	}	877	}
1117		878
1118	if (pl->ns->monitor_spells)	879	if (pl->ns->monitor_spells)
1119	{	880	{
1120	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	881	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1121	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	882	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1122	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	883	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1123	}	884	}
1124		885
1125	rangetostring (pl->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 */
1126	AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);	887	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1127	set_title (pl->ob, buf);	888	set_title (ob, buf);
1128	AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);	889	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1129		890
1130	/* Only send it away if we have some actual data */	891	/* Only send it away if we have some actual data */
1131	if (sl.length () > 6)	892	if (sl.length () > 6)
1132	pl->ns->send_packet (sl);	893	ns->send_packet (sl);
1133	}	894	}
1134		895
1135	/**	896	/**
1136	* 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.
1137	*/	898	*/
1138	void	899	void
1139	esrv_new_player (player *pl, uint32 weight)	900	esrv_new_player (player *pl)
1140	{	901	{
1141	pl->last_weight = weight;	902	sint32 weight = pl->ob->client_weight ();
1142		903
1143	packet sl ("player");	904	packet sl ("player");
1144		905
1145	sl << uint32 (pl->ob->count)	906	sl << uint32 (pl->ob->count)
1146	<< uint32 (weight)	907	<< uint32 (weight)
1147	<< uint32 (pl->ob->face->number)	908	<< uint32 (pl->ob->face)
1148	<< data8 (pl->ob->name);	909	<< data8 (pl->ob->name);
1149		910
		911	pl->ns->last_weight = weight;
1150	pl->ns->send_packet (sl);	912	pl->ns->send_packet (sl);
1151	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1152	}	913	}
1153
1154	/**
1155	* Need to send an animation sequence to the client.
1156	* We will send appropriate face commands to the client if we haven't
1157	* sent them the face yet (this can become quite costly in terms of
1158	* how much we are sending - on the other hand, this should only happen
1159	* when the player logs in and picks stuff up.
1160	*/
1161	void
1162	esrv_send_animation (client * ns, short anim_num)
1163	{
1164	/* Do some checking on the anim_num we got. Note that the animations
1165	* are added in contigous order, so if the number is in the valid
1166	* range, it must be a valid animation.
1167	*/
1168	if (anim_num < 0 || anim_num > num_animations)
1169	{
1170	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1171	return;
1172	}
1173
1174	packet sl ("anim");
1175
1176	sl << uint16 (anim_num)
1177	<< uint16 (0); /* flags - not used right now */
1178
1179	/* Build up the list of faces. Also, send any information (ie, the
1180	* the face itself) down to the client.
1181	*/
1182	for (int i = 0; i < animations[anim_num].num_animations; i++)
1183	{
1184	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1185	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1186
1187	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1188	}
1189
1190	ns->send_packet (sl);
1191
1192	ns->anims_sent[anim_num] = 1;
1193	}
1194
1195		914
1196	/******************************************************************************	915	/******************************************************************************
1197	*	916	*
1198	* Start of map related commands.	917	* Start of map related commands.
1199	*	918	*
1200	******************************************************************************/	919	******************************************************************************/
1201		920
1202	/**
1203	* This adds face_num to a map cell at x,y. If the client doesn't have
1204	* the face yet, we will also send it.
1205	*/
1206	static void
1207	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1208	{
1209	if (newmap->cells[x][y].count >= MAP_LAYERS)
1210	{
1211	//TODO: one or the other, can't both have abort and return, verify and act
1212	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1213	return;
1214	abort ();
1215	}
1216
1217	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1218	newmap->cells[x][y].count++;
1219
1220	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1221	esrv_send_face (ns, face_num, 0);
1222	}
1223
1224	/** Clears a map cell */	921	/** Clears a map cell */
1225	static void	922	static void
1226	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	923	map_clearcell (struct MapCell *cell, int count)
1227	{	924	{
1228	cell->faces[0] = face0;	925	cell->faces[0] = 0;
1229	cell->faces[1] = face1;	926	cell->faces[1] = 0;
1230	cell->faces[2] = face2;	927	cell->faces[2] = 0;
		928	cell->smooth[0] = 0;
		929	cell->smooth[1] = 0;
		930	cell->smooth[2] = 0;
1231	cell->count = count;	931	cell->count = count;
1232	cell->stat_hp = 0;	932	cell->stat_hp = 0;
1233	cell->flags = 0;	933	cell->flags = 0;
1234	cell->player = 0;	934	cell->player = 0;
1235	}	935	}
1236		936
1237	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1238	#define MAX_LAYERS 3	937	#define MAX_LAYERS 3
1239
1240	/* Using a global really isn't a good approach, but saves the over head of
1241	* allocating and deallocating such a block of data each time run through,
1242	* and saves the space of allocating this in the socket object when we only
1243	* need it for this cycle. If the server is ever threaded, this needs to be
1244	* re-examined.
1245	*/
1246	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1247
1248	/**
1249	* Returns true if any of the heads for this
1250	* space is set. Returns false if all are blank - this is used
1251	* for empty space checking.
1252	*/
1253	static inline int
1254	have_head (int ax, int ay)
1255	{
1256	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1257	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1258	return 1;
1259
1260	return 0;
1261	}
1262
1263	/**
1264	* check_head is a bit simplistic version of update_space below.
1265	* basically, it only checks the that the head on space ax,ay at layer
1266	* needs to get sent - if so, it adds the data, sending the head
1267	* if needed, and returning 1. If this no data needs to get
1268	* sent, it returns zero.
1269	*/
1270	static int
1271	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1272	{
1273	short face_num;
1274
1275	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1276	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1277	else
1278	face_num = 0;
1279
1280	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1281	{
1282	sl << uint16 (face_num);
1283	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1284	esrv_send_face (&ns, face_num, 0);
1285
1286	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1287	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1288	return 1;
1289	}
1290
1291	return 0; /* No change */
1292	}
1293		938
1294	/**	939	/**
1295	* Removes the need to replicate the same code for each layer.	940	* Removes the need to replicate the same code for each layer.
1296	* this returns true if this space is now in fact different than	941	* this returns true if this space is now in fact different than
1297	* it was.	942	* it was.
1298	* sl is the socklist this data is going into.	943	* sl is the socklist this data is going into.
1299	* ns is the socket we are working on - all the info we care	944	* ns is the socket we are working on - all the info we care
1300	* about is in this socket structure, so now need not pass the	945	* about is in this socket structure, so now need not pass the
1301	* entire player object.	946	* entire player object.
1302	* mx and my are map coordinate offsets for map mp
1303	* sx and sy are the offsets into the socket structure that
1304	* holds the old values.
1305	* layer is the layer to update, with 2 being the floor and 0 the	947	* layer is the layer to update, with 2 being the floor and 0 the
1306	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	948	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1307	* take. Interesting to note that before this function, the map1 function	949	* take. Interesting to note that before this function, the map1 function
1308	* numbers the spaces differently - I think this was a leftover from	950	* numbers the spaces differently - I think this was a leftover from
1309	* the map command, where the faces stack up. Sinces that is no longer	951	* the map command, where the faces stack up. Sinces that is no longer
1310	* the case, it seems to make more sense to have these layer values	952	* the case, it seems to make more sense to have these layer values
1311	* actually match.	953	* actually match.
1312	*/	954	*/
1313	static int	955	static int
1314	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	956	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1315	{	957	{
1316	object *ob, *head;	958	object *ob = ms.faces_obj [layer];
1317	uint16 face_num;
1318	int bx, by, i;
1319
1320	/* If there is a multipart object stored away, treat that as more important.
1321	* If not, then do the normal processing.
1322	*/
1323	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1324
1325	/* Check to see if this head is part of the set of objects
1326	* we would normally send for this space. If so, then
1327	* don't use the head value. We need to do the check
1328	* here and not when setting up the heads[] value for two reasons -
1329	* 1) the heads[] values will get used even if the space is not visible.
1330	* 2) its possible the head is not on the same map as a part, and I'd
1331	* rather not need to do the map translation overhead.
1332	* 3) We need to do some extra checking to make sure that we will
1333	* otherwise send the image as this layer, eg, either it matches
1334	* the head value, or is not multipart.
1335	*/
1336	if (head && !head->more)
1337	{
1338	for (i = 0; i < MAP_LAYERS; i++)
1339	{
1340	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1341	if (!ob)
1342	continue;
1343
1344	if (ob->head)
1345	ob = ob->head;
1346
1347	if (ob == head)
1348	{
1349	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1350	head = NULL;
1351	break;
1352	}
1353	}
1354	}
1355
1356	ob = head;
1357	if (!ob)
1358	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1359		959
1360	/* If there is no object for this space, or if the face for the object	960	/* If there is no object for this space, or if the face for the object
1361	* is the blank face, set the face number to zero.	961	* is the blank face, set the face number to zero.
1362	* else if we have the stored head object for this space, that takes	962	* else if we have the stored head object for this space, that takes
1363	* precedence over the other object for this space.	963	* precedence over the other object for this space.
1364	* otherwise, we do special head processing	964	* otherwise, we do special head processing
1365	*/	965	*/
1366	if (!ob || ob->face == blank_face)	966	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1367	face_num = 0;
1368	else if (head)
1369	{
1370	/* if this is a head that had previously been stored */
1371	face_num = ob->face->number;
1372	}
1373	else
1374	{
1375	/* if the faces for the different parts of a multipart object
1376	* are the same, we only want to send the bottom right most
1377	* portion of the object. That info is in the tail_.. values
1378	* of the head. Note that for the head itself, ob->head will
1379	* be null, so we only do this block if we are working on
1380	* a tail piece.
1381	*/
1382
1383	/* tail_x and tail_y will only be set in the head object. If
1384	* this is the head object and these are set, we proceed
1385	* with logic to only send bottom right. Similarly, if
1386	* this is one of the more parts but the head has those values
1387	* set, we want to do the processing. There can be cases where
1388	* the head is not visible but one of its parts is, so we just
1389	* can always expect that ob->arch->tail_x will be true for all
1390	* object we may want to display.
1391	*/
1392	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1393	{
1394
1395	if (ob->head)
1396	head = ob->head;
1397	else
1398	head = ob;
1399
1400	/* Basically figure out where the offset is from where we are right
1401	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1402	* piece is from the head, and the tail is where the tail is from the
1403	* head. Note that bx and by will equal sx and sy if we are already working
1404	* on the bottom right corner. If ob is the head, the clone values
1405	* will be zero, so the right thing will still happen.
1406	*/
1407	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1408	by = sy + head->arch->tail_y - ob->arch->clone.y;
1409
1410	/* I don't think this can ever happen, but better to check for it just
1411	* in case.
1412	*/
1413	if (bx < sx || by < sy)
1414	{
1415	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1416	face_num = 0;
1417	}
1418	/* single part object, multipart object with non merged faces,
1419	* of multipart object already at lower right.
1420	*/
1421	else if (bx == sx && by == sy)
1422	{
1423	face_num = ob->face->number;
1424
1425	/* if this face matches one stored away, clear that one away.
1426	* this code relies on the fact that the map1 commands
1427	* goes from 2 down to 0.
1428	*/
1429	for (i = 0; i < MAP_LAYERS; i++)
1430	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1431	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1432	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1433	}
1434	else
1435	{
1436	/* If this head is stored away, clear it - otherwise,
1437	* there can be cases where a object is on multiple layers -
1438	* we only want to send it once.
1439	*/
1440	face_num = head->face->number;
1441	for (i = 0; i < MAP_LAYERS; i++)
1442	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1443	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1444	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1445
1446	/* First, try to put the new head on the same layer. If that is used up,
1447	* then find another layer.
1448	*/
1449	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1450	{
1451	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1452	}
1453	else
1454	for (i = 0; i < MAX_LAYERS; i++)
1455	{
1456	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1457	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1458	{
1459	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1460	}
1461	}
1462	face_num = 0; /* Don't send this object - we'll send the head later */
1463	}
1464	}
1465	else
1466	{
1467	/* In this case, we are already at the lower right or single part object,
1468	* so nothing special
1469	*/
1470	face_num = ob->face->number;
1471
1472	/* clear out any head entries that have the same face as this one */
1473	for (bx = 0; bx < layer; bx++)
1474	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1475	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1476	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1477	}
1478	} /* else not already head object or blank face */
1479
1480	/* This is a real hack. Basically, if we have nothing to send for this layer,
1481	* but there is a head on the next layer, send that instead.
1482	* Without this, what happens is you can get the case where the player stands
1483	* on the same space as the head. However, if you have overlapping big objects
1484	* of the same type, what happens then is it doesn't think it needs to send
1485	* This tends to make stacking also work/look better.
1486	*/
1487	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1488	{
1489	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1490	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1491	}
1492
1493	/* Another hack - because of heads and whatnot, this face may match one
1494	* we already sent for a lower layer. In that case, don't send
1495	* this one.
1496	*/
1497	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1498	face_num = 0;
1499		967
1500	/* We've gotten what face we want to use for the object. Now see if	968	/* We've gotten what face we want to use for the object. Now see if
1501	* if it has changed since we last sent it to the client.	969	* if it has changed since we last sent it to the client.
1502	*/	970	*/
1503	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	971	if (lastcell.faces[layer] != face_num)
1504	{	972	{
1505	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	973	lastcell.faces[layer] = face_num;
		974
1506	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	975	if (!ns.faces_sent[face_num])
		976	if (ob)
		977	ns.send_faces (ob);
		978	else
1507	esrv_send_face (&ns, face_num, 0);	979	ns.send_face (face_num, 10);
1508		980
1509	sl << uint16 (face_num);	981	sl << uint16 (face_num);
1510	return 1;
1511	}
1512
1513	/* Nothing changed */
1514	return 0;
1515	}
1516
1517	/**
1518	* This function is mainly a copy of update_space,
1519	* except it handles update of the smoothing updates,
1520	* not the face updates.
1521	* Removes the need to replicate the same code for each layer.
1522	* this returns true if this smooth is now in fact different
1523	* than it was.
1524	* sl is the socklist this data is going into.
1525	* ns is the socket we are working on - all the info we care
1526	* about is in this socket structure, so know need to pass the
1527	* entire player object.
1528	* mx and my are map coordinate offsets for map mp
1529	* sx and sy are the offsets into the socket structure that
1530	* holds the old values.
1531	* layer is the layer to update, with 2 being the floor and 0 the
1532	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1533	* take.
1534	*/
1535
1536	static inline int
1537	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1538	{
1539	object *ob;
1540	int smoothlevel; /* old face_num; */
1541
1542	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1543
1544	/* If there is no object for this space, or if the face for the object
1545	* is the blank face, set the smoothlevel to zero.
1546	*/
1547	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1548	smoothlevel = 0;
1549	else
1550	{
1551	smoothlevel = ob->smoothlevel;
1552	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1553	SendSmooth (&ns, ob->face->number);
1554	} /* else not already head object or blank face */
1555
1556	/* We've gotten what face we want to use for the object. Now see if
1557	* if it has changed since we last sent it to the client.
1558	*/
1559	if (smoothlevel > 255)
1560	smoothlevel = 255;
1561	else if (smoothlevel < 0)
1562	smoothlevel = 0;
1563
1564	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1565	{
1566	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1567	sl << uint8 (smoothlevel);
1568	return 1;	982	return 1;
1569	}	983	}
1570		984
1571	/* Nothing changed */	985	/* Nothing changed */
1572	return 0;	986	return 0;
…		…
1589	}	1003	}
1590		1004
1591	return result;	1005	return result;
1592	}	1006	}
1593		1007
		1008	// prefetch (and touch) all maps within a specific distancd
		1009	static void
		1010	prefetch_surrounding_maps (maptile *map, int distance)
		1011	{
		1012	map->last_access = runtime;
		1013
		1014	if (--distance)
		1015	for (int dir = 4; --dir; )
		1016	if (const shstr &path = map->tile_path [dir])
		1017	if (maptile *&neigh = map->tile_map [dir])
		1018	prefetch_surrounding_maps (neigh, distance);
		1019	else
		1020	neigh = maptile::find_async (path, map);
		1021	}
		1022
		1023	// prefetch a generous area around the player
		1024	static void
		1025	prefetch_surrounding_maps (object *op)
		1026	{
		1027	prefetch_surrounding_maps (op->map, 3);
		1028	}
		1029
1594	/**	1030	/**
1595	* This function uses the new map1 protocol command to send the map	1031	* Draws client map.
1596	* to the client. It is necessary because the old map command supports
1597	* a maximum map size of 15x15.
1598	* This function is much simpler than the old one. This is because
1599	* the old function optimized to send as few face identifiers as possible,
1600	* at the expense of sending more coordinate location (coordinates were
1601	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1602	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1603	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1604	* and use the other 4 bits for other informatiion. For full documentation
1605	* of what we send, see the doc/Protocol file.
1606	* I will describe internally what we do:
1607	* the ns->lastmap shows how the map last looked when sent to the client.
1608	* in the lastmap structure, there is a cells array, which is set to the
1609	* maximum viewable size (As set in config.h).
1610	* in the cells, there are faces and a count value.
1611	* we use the count value to hold the darkness value. If -1, then this space
1612	* is not viewable.
1613	* we use faces[0] faces[1] faces[2] to hold what the three layers
1614	* look like.
1615	*/	1032	*/
1616	void	1033	void
1617	draw_client_map1 (object *pl)	1034	draw_client_map (player *pl)
1618	{	1035	{
1619	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1036	object *ob = pl->observe;
1620	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;
1621	int estartlen, eoldlen;	1048	int estartlen, eoldlen;
1622	uint16 mask, emask;
1623	uint8 eentrysize;	1049	uint8 eentrysize;
1624	uint16 ewhatstart, ewhatflag;	1050	uint16 ewhatstart, ewhatflag;
1625	uint8 extendedinfos;	1051	uint8 extendedinfos;
1626	maptile *m;
1627		1052
		1053	check_map_change (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
1628	client &socket = *pl->contr->ns;	1087	client &socket = *pl->ns;
1629
1630	check_map_change (pl->contr);
1631		1088
1632	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1089	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1633	packet esl;	1090	packet esl;
1634		1091
1635	startlen = sl.length ();	1092	startlen = sl.length ();
…		…
1650	<< uint8 (extendedinfos)	1107	<< uint8 (extendedinfos)
1651	<< uint8 (eentrysize);	1108	<< uint8 (eentrysize);
1652		1109
1653	estartlen = esl.length ();	1110	estartlen = esl.length ();
1654	}	1111	}
1655	else
1656	{
1657	/* suppress compiler warnings */
1658	ewhatstart = 0;
1659	ewhatflag = 0;
1660	estartlen = 0;
1661	}
1662		1112
1663	/* Init data to zero */	1113	int hx = socket.mapx / 2;
1664	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);	1114	int hy = socket.mapy / 2;
1665		1115
1666	/* x,y are the real map locations. ax, ay are viewport relative	1116	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1667	* locations.	1117	int ax = dx + hx;
		1118	int ay = dy + hy;
		1119
		1120	int emask, mask;
		1121	emask = mask = (ax << 10) | (ay << 4);
		1122
		1123	MapCell &lastcell = socket.lastmap.cells[ax][ay];
		1124
		1125	/* If the coordinates are not valid, or it is too dark to see,
		1126	* we tell the client as such
1668	*/	1127	*/
1669	ay = 0;	1128	if (!m)
1670
1671	/* We could do this logic as conditionals in the if statement,
1672	* but that started to get a bit messy to look at.
1673	*/
1674	max_x = pl->x + (socket.mapx + 1) / 2;
1675	max_y = pl->y + (socket.mapy + 1) / 2;
1676
1677	if (socket.mapmode == Map1aCmd)
1678	{
1679	max_x += MAX_HEAD_OFFSET;
1680	max_y += MAX_HEAD_OFFSET;
1681	}
1682
1683	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1684	{
1685	ax = 0;
1686	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1687	{	1129	{
1688	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1130	/* space is out of map. Update space and clear values
1689		1131	* if this hasn't already been done. If the space is out
1690	/* If this space is out of the normal viewable area, we only check	1132	* of the map, it shouldn't have a head.
1691	* the heads value ax or ay will only be greater than what
1692	* the client wants if using the map1a command - this is because
1693	* if the map1a command is not used, max_x and max_y will be
1694	* set to lower values.
1695	*/	1133	*/
1696	if (ax >= socket.mapx || ay >= socket.mapy)	1134	if (lastcell.count != -1)
1697	{	1135	{
1698	int i, got_one;
1699
1700	oldlen = sl.length ();
1701
1702	sl << uint16 (mask);	1136	sl << uint16 (mask);
		1137	map_clearcell (&lastcell, -1);
		1138	}
1703		1139
1704	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;	1140	continue;
1705	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;	1141	}
1706	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;	1142
		1143	int d = pl->blocked_los_uc (dx, dy);
1707		1144
1708	/* If all we are doing is sending 0 (blank) faces, we don't	1145	if (d > 3)
1709	* actually need to send that - just the coordinates	1146	{
1710	* with no faces tells the client to blank out the	1147	/* This block deals with spaces that are not visible for whatever
1711	* space.	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)
1712	*/	1191	{
1713	got_one = 0;	1192	*last_ext |= 0x80;
1714	for (i = oldlen + 2; i < sl.length (); i++)	1193	last_ext = &sl[sl.length ()];
1715	if (sl[i])	1194	sl << uint8 (d);
1716	got_one = 1;	1195	}
1717
1718	if (got_one && (mask & 0xf))
1719	sl[oldlen + 1] = mask & 0xff;
1720	else	1196	else
1721	{ /*either all faces blank, either no face at all */	1197	sl << uint8 (255 - 64 * d);
1722	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */	1198	}
1723	sl.reset (oldlen + 2);	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)
		1215	{
		1216	if (op->stats.maxhp > op->stats.hp
		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)))
1724	else	1223	{
1725	sl.reset (oldlen);	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;
1726	}	1235	}
1727		1236
1728	/*What concerns extendinfos, nothing to be done for now	1237	if (expect_false (lastcell.stat_hp != stat_hp))
1729	* (perhaps effects layer later)
1730	*/
1731	continue; /* don't do processing below */
1732	}
1733
1734	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1735
1736	d = pl->contr->blocked_los[ax][ay];
1737
1738	/* If the coordinates are not valid, or it is too dark to see,
1739	* we tell the client as such
1740	*/
1741	nx = x;
1742	ny = y;
1743	m = get_map_from_coord (pl->map, &nx, &ny);
1744
1745	if (!m)
1746	{
1747	/* space is out of map. Update space and clear values
1748	* if this hasn't already been done. If the space is out
1749	* of the map, it shouldn't have a head
1750	*/
1751	if (lastcell.count != -1)
1752	{	1238	{
1753	sl << uint16 (mask);	1239	lastcell.stat_hp = stat_hp;
1754	map_clearcell (&lastcell, 0, 0, 0, -1);
1755	}
1756	}
1757	else if (d > 3)
1758	{
1759	int need_send = 0, count;
1760		1240
1761	/* This block deals with spaces that are not visible for whatever
1762	* reason. Still may need to send the head for this space.
1763	*/
1764
1765	oldlen = sl.length ();
1766
1767	sl << uint16 (mask);
1768
1769	if (lastcell.count != -1)
1770	need_send = 1;
1771
1772	count = -1;
1773
1774	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1775	{
1776	/* Now check to see if any heads need to be sent */
1777
1778	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1779	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1780	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1781
1782	lastcell.count = count;
1783	}
1784	else
1785	{
1786	/* properly clear a previously sent big face */
1787	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1788	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1789	need_send = 1;
1790
1791	map_clearcell (&lastcell, 0, 0, 0, count);
1792	}
1793
1794	if ((mask & 0xf) || need_send)
1795	sl[oldlen + 1] = mask & 0xff;
1796	else
1797	sl.reset (oldlen);
1798	}
1799	else
1800	{
1801	/* In this block, the space is visible or there are head objects
1802	* we need to send.
1803	*/
1804
1805	/* Rather than try to figure out what everything that we might
1806	* need to send is, then form the packet after that,
1807	* we presume that we will in fact form a packet, and update
1808	* the bits by what we do actually send. If we send nothing,
1809	* we just back out sl.length () to the old value, and no harm
1810	* is done.
1811	* I think this is simpler than doing a bunch of checks to see
1812	* what if anything we need to send, setting the bits, then
1813	* doing those checks again to add the real data.
1814	*/
1815	oldlen = sl.length ();
1816	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1817	eoldlen = esl.length ();
1818	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1819	sl << uint16 (mask);
1820
1821	if (socket.ext_mapinfos)
1822	esl << uint16 (emask);
1823
1824	unsigned char dummy;
1825	unsigned char *last_ext = &dummy;
1826
1827	/* Darkness changed */
1828	if (lastcell.count != d && socket.darkness)
1829	{
1830	mask |= 0x8;	1241	mask |= 0x8;
		1242	*last_ext |= 0x80;
		1243	last_ext = &sl[sl.length ()];
1831		1244
1832	if (socket.extmap)	1245	sl << uint8 (5) << uint8 (stat_hp);
		1246
		1247	if (stat_width > 1)
1833	{	1248	{
1834	*last_ext |= 0x80;	1249	*last_ext |= 0x80;
1835	last_ext = &sl[sl.length ()];	1250	last_ext = &sl[sl.length ()];
1836	sl << uint8 (d);
1837	}
1838	else
1839	sl << uint8 (255 - 64 * d);
1840	}
1841		1251
1842	lastcell.count = d;
1843
1844	if (socket.extmap)
1845	{
1846	uint8 stat_hp = 0;
1847	uint8 stat_width = 0;
1848	uint8 flags = 0;
1849	UUID player = 0;
1850
1851	// send hp information, if applicable
1852	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
1853	{
1854	if (op->head || op->invisible)
1855	; // do not show
1856	else if (op->type == PLAYER
1857	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1858	{
1859	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1860	{
1861	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1862	stat_width = op->arch->tail_x;
1863	}
1864	}
1865
1866	if (op->msg && op->msg[0] == '@')
1867	flags |= 1;
1868
1869	if (op->type == PLAYER && op != pl)
1870	player = op->count;
1871	}
1872
1873	if (lastcell.stat_hp != stat_hp)
1874	{
1875	lastcell.stat_hp = stat_hp;
1876
1877	mask |= 0x8;
1878	*last_ext |= 0x80;
1879	last_ext = &sl[sl.length ()];
1880
1881	sl << uint8 (5) << uint8 (stat_hp);
1882
1883	if (stat_width > 1)
1884	{
1885	*last_ext |= 0x80;
1886	last_ext = &sl[sl.length ()];
1887
1888	sl << uint8 (6) << uint8 (stat_width);	1252	sl << uint8 (6) << uint8 (stat_width);
1889	}
1890	}	1253	}
1891
1892	if (lastcell.player != player)
1893	{
1894	lastcell.player = player;
1895
1896	mask |= 0x8;
1897	*last_ext |= 0x80;
1898	last_ext = &sl[sl.length ()];
1899
1900	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1901	}
1902
1903	if (lastcell.flags != flags)
1904	{
1905	lastcell.flags = flags;
1906
1907	mask |= 0x8;
1908	*last_ext |= 0x80;
1909	last_ext = &sl[sl.length ()];
1910
1911	sl << uint8 (8) << uint8 (flags);
1912	}
1913	}	1254	}
1914		1255
1915	/* Floor face */	1256	if (expect_false (lastcell.player != player))
1916	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1257	{
		1258	lastcell.player = player;
		1259
1917	mask |= 0x4;	1260	mask |= 0x8;
1918
1919	if (socket.EMI_smooth)
1920	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1921	emask |= 0x4;	1261	*last_ext |= 0x80;
		1262	last_ext = &sl[sl.length ()];
1922		1263
1923	/* Middle face */	1264	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1924	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1265	}
		1266
		1267	if (expect_false (lastcell.flags != flags))
		1268	{
		1269	lastcell.flags = flags;
		1270
1925	mask |= 0x2;	1271	mask |= 0x8;
1926
1927	if (socket.EMI_smooth)
1928	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1929	emask |= 0x2;	1272	*last_ext |= 0x80;
		1273	last_ext = &sl[sl.length ()];
1930		1274
1931	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))	1275	sl << uint8 (8) << uint8 (flags);
1932	{
1933	if (lastcell.faces[0] != pl->face->number)
1934	{
1935	lastcell.faces[0] = pl->face->number;
1936	mask |= 0x1;
1937
1938	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1939	esrv_send_face (&socket, pl->face->number, 0);
1940
1941	sl << uint16 (pl->face->number);
1942	}
1943	}	1276	}
1944	else	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	{
		1291	// force player to be visible to himself if invisible
		1292	if (lastcell.faces[0] != ob->face)
1945	{	1293	{
1946	/* Top face */	1294	lastcell.faces[0] = ob->face;
1947	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1295
1948	mask |= 0x1;	1296	mask |= 0x1;
		1297	sl << uint16 (ob->face);
1949		1298
1950	if (socket.EMI_smooth)	1299	socket.send_faces (ob);
1951	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1952	emask |= 0x1;
1953	}	1300	}
		1301	}
		1302	/* Top face */
		1303	else if (update_space (sl, socket, ms, lastcell, 0))
		1304	mask |= 0x1;
1954		1305
1955	/* 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
1956	* space by checking the mask. If so, update the mask.	1307	* space by checking the mask. If so, update the mask.
1957	* 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
1958	* value, so we don't send those bits.	1309	* value, so we don't send those bits.
1959	*/	1310	*/
1960	if (mask & 0xf)	1311	if (mask & 0xf)
1961	sl[oldlen + 1] = mask & 0xff;	1312	sl[oldlen + 1] = mask & 0xff;
1962	else	1313	else
1963	sl.reset (oldlen);	1314	sl.reset (oldlen);
1964		1315
		1316	if (socket.ext_mapinfos)
		1317	esl << uint16 (emask);
		1318
		1319	if (socket.EMI_smooth)
		1320	{
		1321	for (int layer = 2+1; layer--; )
		1322	{
		1323	object *ob = ms.faces_obj [layer];
		1324
		1325	// If there is no object for this space, or if the face for the object
		1326	// is the blank face, set the smoothlevel to zero.
		1327	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1328
		1329	// We've gotten what face we want to use for the object. Now see if
		1330	// if it has changed since we last sent it to the client.
		1331	if (lastcell.smooth[layer] != smoothlevel)
		1332	{
		1333	lastcell.smooth[layer] = smoothlevel;
		1334	esl << uint8 (smoothlevel);
		1335	emask |= 1 << layer;
		1336	}
		1337	}
		1338
1965	if (emask & 0xf)	1339	if (emask & 0xf)
1966	esl[eoldlen + 1] = emask & 0xff;	1340	esl[eoldlen + 1] = emask & 0xff;
1967	else	1341	else
1968	esl.reset (eoldlen);	1342	esl.reset (eoldlen);
		1343	}
1969	} /* else this is a viewable space */	1344	} /* else this is a viewable space */
1970	} /* for x loop */	1345	ordered_mapwalk_end
1971	} /* for y loop */	1346
		1347	socket.flush_fx ();
1972		1348
1973	/* Verify that we in fact do need to send this */	1349	/* Verify that we in fact do need to send this */
1974	if (socket.ext_mapinfos)	1350	if (socket.ext_mapinfos)
1975	{	1351	{
1976	if (!(sl.length () > startlen || socket.sent_scroll))	1352	if (!(sl.length () > startlen || socket.sent_scroll))
1977	{	1353	{
1978	/* No map data will follow, so don't say the client	1354	/* No map data will follow, so don't say the client
1979	* it doesn't need draw!	1355	* it doesn't need draw!
1980	*/	1356	*/
1981	ewhatflag &= (~EMI_NOREDRAW);	1357	ewhatflag &= ~EMI_NOREDRAW;
1982	esl[ewhatstart + 1] = ewhatflag & 0xff;	1358	esl[ewhatstart + 1] = ewhatflag & 0xff;
1983	}	1359	}
1984		1360
1985	if (esl.length () > estartlen)	1361	if (esl.length () > estartlen)
1986	socket.send_packet (esl);	1362	socket.send_packet (esl);
…		…
1991	socket.send_packet (sl);	1367	socket.send_packet (sl);
1992	socket.sent_scroll = 0;	1368	socket.sent_scroll = 0;
1993	}	1369	}
1994	}	1370	}
1995		1371
1996	/**
1997	* Draws client map.
1998	*/
1999	void
2000	draw_client_map (object *pl)
2001	{
2002	int i, j;
2003	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2004	New_Face *face, *floor;
2005	New_Face *floor2;
2006	int d, mflags;
2007	struct Map newmap;
2008	maptile *m, *pm;
2009
2010	if (pl->type != PLAYER)
2011	{
2012	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2013	return;
2014	}
2015
2016	pm = pl->map;
2017
2018	/* If player is just joining the game, he isn't here yet, so the map
2019	* can get swapped out. If so, don't try to send them a map. All will
2020	* be OK once they really log in.
2021	*/
2022	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2023	return;
2024
2025	memset (&newmap, 0, sizeof (struct Map));
2026
2027	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2028	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2029	{
2030	ax = i;
2031	ay = j;
2032	m = pm;
2033	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2034
2035	if (mflags & P_OUT_OF_MAP)
2036	continue;
2037
2038	/* If a map is visible to the player, we don't want to swap it out
2039	* just to reload it. This should really call something like
2040	* swap_map, but this is much more efficient and 'good enough'
2041	*/
2042	if (mflags & P_NEW_MAP)
2043	m->timeout = 50;
2044	}
2045
2046	/* do LOS after calls to update_position */
2047	if (pl->contr->do_los)
2048	{
2049	update_los (pl);
2050	pl->contr->do_los = 0;
2051	}
2052
2053	/* Big maps need a different drawing mechanism to work */
2054	draw_client_map1 (pl);
2055	}
2056
2057
2058	/*****************************************************************************/	1372	/*****************************************************************************/
2059
2060	/* 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*/
2061
2062	/* 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 */
2063
2064	/* manage it ! */	1375	/* manage it ! */
2065
2066	/*****************************************************************************/	1376	/*****************************************************************************/
2067	void	1377	void
2068	send_plugin_custom_message (object *pl, char *buf)	1378	send_plugin_custom_message (object *pl, char *buf)
2069	{	1379	{
2070	pl->contr->ns->send_packet (buf);	1380	pl->contr->ns->send_packet (buf);
…		…
2079	{	1389	{
2080	packet sl;	1390	packet sl;
2081	sl << "replyinfo skill_info\n";	1391	sl << "replyinfo skill_info\n";
2082		1392
2083	for (int i = 1; i < NUM_SKILLS; i++)	1393	for (int i = 1; i < NUM_SKILLS; i++)
2084	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]);
2085		1395
2086	if (sl.length () >= MAXSOCKBUF)	1396	if (sl.length () > MAXSOCKBUF)
2087	{	1397	{
2088	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1398	LOG (llevError, "Buffer overflow in send_skill_info!\n");
2089	fatal (0);	1399	fatal (0);
2090	}	1400	}
2091		1401
…		…
2104	sl << "replyinfo spell_paths\n";	1414	sl << "replyinfo spell_paths\n";
2105		1415
2106	for (int i = 0; i < NRSPELLPATHS; i++)	1416	for (int i = 0; i < NRSPELLPATHS; i++)
2107	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1417	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2108		1418
2109	if (sl.length () >= MAXSOCKBUF)	1419	if (sl.length () > MAXSOCKBUF)
2110	{	1420	{
2111	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1421	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2112	fatal (0);	1422	fatal (0);
2113	}	1423	}
2114		1424
…		…
2120	* it then sends an updspell packet for each spell that has changed in this way	1430	* it then sends an updspell packet for each spell that has changed in this way
2121	*/	1431	*/
2122	void	1432	void
2123	esrv_update_spells (player *pl)	1433	esrv_update_spells (player *pl)
2124	{	1434	{
		1435	if (!pl->ns)
		1436	return;
		1437
2125	if (!pl->ns->monitor_spells)	1438	if (!pl->ns->monitor_spells)
2126	return;	1439	return;
2127		1440
2128	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1441	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2129	{	1442	{
2130	if (spell->type == SPELL)	1443	if (spell->type == SPELL)
2131	{	1444	{
2132	int flags = 0;	1445	int flags = 0;
2133		1446
2134	/* check if we need to update it */	1447	/* check if we need to update it */
2135	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))
2136	{	1449	{
2137	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);
2138	flags |= UPD_SP_MANA;	1451	flags |= UPD_SP_MANA;
2139	}	1452	}
2140		1453
2141	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))
2142	{	1455	{
2143	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);
2144	flags |= UPD_SP_GRACE;	1457	flags |= UPD_SP_GRACE;
2145	}	1458	}
2146		1459
2147	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))
2148	{	1461	{
2149	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);
2150	flags |= UPD_SP_DAMAGE;	1463	flags |= UPD_SP_DAMAGE;
2151	}	1464	}
2152		1465
2153	if (flags)	1466	if (flags)
2154	{	1467	{
…		…
2156		1469
2157	sl << "updspell "	1470	sl << "updspell "
2158	<< uint8 (flags)	1471	<< uint8 (flags)
2159	<< uint32 (spell->count);	1472	<< uint32 (spell->count);
2160		1473
2161	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1474	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
2162	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1475	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
2163	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1476	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
2164		1477
2165	pl->ns->send_packet (sl);	1478	pl->ns->send_packet (sl);
2166	}	1479	}
2167	}	1480	}
2168	}	1481	}
…		…
2189		1502
2190	/* appends the spell *spell to the Socklist we will send the data to. */	1503	/* appends the spell *spell to the Socklist we will send the data to. */
2191	static void	1504	static void
2192	append_spell (player *pl, packet &sl, object *spell)	1505	append_spell (player *pl, packet &sl, object *spell)
2193	{	1506	{
2194	int len, i, skill = 0;	1507	int i, skill = 0;
2195		1508
2196	if (!(spell->name))	1509	if (!(spell->name))
2197	{	1510	{
2198	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);
2199	return;	1512	return;
2200	}	1513	}
2201		1514
2202	/* 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 */
2203	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);
2204	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);
2205	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);
2206		1519
2207	/* figure out which skill it uses, if it uses one */	1520	/* figure out which skill it uses, if it uses one */
2208	if (spell->skill)	1521	if (spell->skill)
2209	{	1522	if (object *tmp = pl->find_skill (spell->skill))
2210	for (i = 1; i < NUM_SKILLS; i++)
2211	if (!strcmp (spell->skill, skill_names[i]))
2212	{
2213	skill = i + CS_STAT_SKILLINFO;	1523	skill = tmp->subtype + CS_STAT_SKILLINFO;
2214	break;	1524
2215	}	1525	// spells better have a face
		1526	if (!spell->face)
2216	}	1527	{
		1528	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1529	spell->face = face_find ("burnout.x11", blank_face);
		1530	}
		1531
		1532	pl->ns->send_face (spell->face);
2217		1533
2218	/* send the current values */	1534	/* send the current values */
2219	sl << uint32 (spell->count)	1535	sl << uint32 (spell->count)
2220	<< uint16 (spell->level)	1536	<< uint16 (spell->level)
2221	<< uint16 (spell->casting_time)	1537	<< uint16 (spell->casting_time)
2222	<< uint16 (spell->last_sp)	1538	<< uint16 (spell->cached_sp)
2223	<< uint16 (spell->last_grace)	1539	<< uint16 (spell->cached_grace)
2224	<< uint16 (spell->last_eat)	1540	<< uint16 (spell->cached_eat)
2225	<< uint8 (skill)	1541	<< uint8 (skill)
2226	<< uint32 (spell->path_attuned)	1542	<< uint32 (spell->path_attuned)
2227	<< uint32 (spell->face ? spell->face->number : 0)	1543	<< uint32 (spell->face)
2228	<< data8 (spell->name)	1544	<< data8 (spell->name)
2229	<< data16 (spell->msg);	1545	<< data16 (spell->msg);
2230	}	1546	}
2231		1547
2232	/**	1548	/**
…		…
2247		1563
2248	packet sl ("addspell");	1564	packet sl ("addspell");
2249		1565
2250	if (!spell)	1566	if (!spell)
2251	{	1567	{
2252	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1568	for (spell = pl->ob->inv; spell; spell = spell->below)
2253	{	1569	{
2254	/* were we to simply keep appending data here, we could exceed	1570	/* were we to simply keep appending data here, we could exceed
2255	* MAXSOCKBUF if the player has enough spells to add, we know that	1571	* MAXSOCKBUF if the player has enough spells to add, we know that
2256	* append_spells will always append 19 data bytes, plus 4 length	1572	* append_spells will always append 19 data bytes, plus 4 length
2257	* 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
2258	* 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,
2259	* 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,
2260	* 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
2261	*/	1577	*/
		1578	if (spell->type != SPELL)
		1579	continue;
		1580
2262	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1581	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
2263	* 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
2264	* 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
2265	* like it will fix this	1584	* like it will fix this
2266	*/	1585	*/
2267	if (spell->type != SPELL)
2268	continue;
2269
2270	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))))
2271	{	1587	{
		1588	pl->ns->flush_fx ();
2272	pl->ns->send_packet (sl);	1589	pl->ns->send_packet (sl);
2273		1590
2274	sl.reset ();	1591	sl.reset ();
2275	sl << "addspell ";	1592	sl << "addspell ";
2276	}	1593	}
…		…
2284	return;	1601	return;
2285	}	1602	}
2286	else	1603	else
2287	append_spell (pl, sl, spell);	1604	append_spell (pl, sl, spell);
2288		1605
2289	if (sl.length () >= MAXSOCKBUF)	1606	if (sl.length () > MAXSOCKBUF)
2290	{	1607	{
2291	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1608	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2292	fatal (0);	1609	fatal (0);
2293	}	1610	}
2294		1611
2295	/* finally, we can send the packet */	1612	/* finally, we can send the packet */
		1613	pl->ns->flush_fx ();
2296	pl->ns->send_packet (sl);	1614	pl->ns->send_packet (sl);
2297	}	1615	}
2298		1616

Diff Legend

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