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

Diff Legend

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