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.72 by root, Mon Mar 12 02:07:43 2007 UTC vs.
Revision 1.152 by root, Tue Oct 20 07:18:11 2009 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	/**	25	/**
26	* \file	26	* \file
27	* Client handling.	27	* Client handling.
…		…
99	*/	99	*/
100	mx = ns->mapx;	100	mx = ns->mapx;
101	my = ns->mapy;	101	my = ns->mapy;
102		102
103	/* the x and y here are coordinates for the new map, i.e. if we moved	103	/* the x and y here are coordinates for the new map, i.e. if we moved
104	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	104	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
105	* if the destination x or y coordinate is outside the viewable	105	* if the destination x or y coordinate is outside the viewable
106	* area, we clear the values - otherwise, the old values	106	* area, we clear the values - otherwise, the old values
107	* are preserved, and the check_head thinks it needs to clear them.	107	* are preserved, and the check_head thinks it needs to clear them.
108	*/	108	*/
109	for (x = 0; x < mx; x++)	109	for (x = 0; x < mx; x++)
110	{
111	for (y = 0; y < my; y++)	110	for (y = 0; y < my; y++)
112	{
113	if (x >= ns->mapx || y >= ns->mapy)	111	if (x >= ns->mapx || y >= ns->mapy)
114	/* clear cells outside the viewable area */	112	/* clear cells outside the viewable area */
115	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	113	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116	else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)	114	else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
117	/* clear newly visible tiles within the viewable area */	115	/* clear newly visible tiles within the viewable area */
118	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	116	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119	else	117	else
120	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	118	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121	}
122	}
123		119
124	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	120	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125		121
126	/* Make sure that the next "map1" command will be sent (even if it is	122	/* Make sure that the next "map1" command will be sent (even if it is
127	* empty).	123	* empty).
…		…
130	}	126	}
131		127
132	static void	128	static void
133	clear_map (player *pl)	129	clear_map (player *pl)
134	{	130	{
		131	pl->ns->mapinfo_queue_clear ();
		132
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	133	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
		134
		135	pl->ns->force_newmap = false;
136		136
137	if (pl->ns->newmapcmd == 1)	137	if (pl->ns->newmapcmd == 1)
138	pl->ns->send_packet ("newmap");	138	pl->ns->send_packet ("newmap");
139		139
140	pl->ns->floorbox_reset ();	140	pl->ns->floorbox_reset ();
		141	}
		142
		143	static void
		144	send_map_info (player *pl)
		145	{
		146	client &socket = *pl->ns;
		147	object *ob = pl->observe;
		148
		149	if (socket.mapinfocmd)
		150	{
		151	if (ob->map && ob->map->path[0])
		152	{
		153	int flags = 0;
		154
		155	if (ob->map->tile_path[0]) flags |= 1;
		156	if (ob->map->tile_path[1]) flags |= 2;
		157	if (ob->map->tile_path[2]) flags |= 4;
		158	if (ob->map->tile_path[3]) flags |= 8;
		159
		160	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		161	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		162	ob->map->width, ob->map->height, &ob->map->path);
		163	}
		164	else
		165	socket.send_packet ("mapinfo current");
		166	}
141	}	167	}
142		168
143	/** check for map/region change and send new map data */	169	/** check for map/region change and send new map data */
144	static void	170	static void
145	check_map_change (player *pl)	171	check_map_change (player *pl)
146	{	172	{
147	client &socket = *pl->ns;	173	client &socket = *pl->ns;
148	object *ob = pl->ob;	174	object *ob = pl->observe;
149	char buf[MAX_BUF]; /* eauugggh */
150		175
151	if (socket.current_map != ob->map)	176	region *reg = ob->region ();
		177	if (socket.current_region != reg)
		178	{
		179	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		180	socket.current_region = reg;
152	{	181	}
		182
		183	// first try to aovid a full newmap on tiled map scrolls
		184	if (socket.current_map != ob->map && !socket.force_newmap)
		185	{
		186	rv_vector rv;
		187
		188	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		189
		190	// manhattan distance is very handy here
		191	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		192	{
		193	socket.current_map = ob->map;
		194	socket.current_x = ob->x;
		195	socket.current_y = ob->y;
		196
		197	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		198	socket.floorbox_reset ();
		199	send_map_info (pl);
		200	}
		201	}
		202
		203	if (socket.current_map != ob->map || socket.force_newmap)
		204	{
		205	clear_map (pl);
153	socket.current_map = ob->map;	206	socket.current_map = ob->map;
154		207	send_map_info (pl);
155	clear_map (pl);
156
157	if (socket.mapinfocmd)
158	{
159	if (ob->map && ob->map->path[0])
160	{
161	int flags = 0;
162
163	if (ob->map->tile_path[0])
164	flags |= 1;
165	if (ob->map->tile_path[1])
166	flags |= 2;
167	if (ob->map->tile_path[2])
168	flags |= 4;
169	if (ob->map->tile_path[3])
170	flags |= 8;
171
172	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
173	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
174	}
175	else
176	snprintf (buf, MAX_BUF, "mapinfo current");
177
178	socket.send_packet (buf);
179	}
180	}	208	}
181	else if (socket.current_x != ob->x || socket.current_y != ob->y)	209	else if (socket.current_x != ob->x || socket.current_y != ob->y)
182	{	210	{
183	int dx = ob->x - socket.current_x;	211	int dx = ob->x - socket.current_x;
184	int dy = ob->y - socket.current_y;	212	int dy = ob->y - socket.current_y;
185		213
186	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
187	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
188	else
189	{
190	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	214	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
191	socket.floorbox_reset ();	215	socket.floorbox_reset ();
192	}
193	}	216	}
194		217
195	socket.current_x = ob->x;	218	socket.current_x = ob->x;
196	socket.current_y = ob->y;	219	socket.current_y = ob->y;
197
198	region *reg = ob->region ();
199	if (socket.current_region != reg)
200	{
201	socket.current_region = reg;
202	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203	}
204	}	220	}
205		221
206	/**	222	/**
207	* RequestInfo is sort of a meta command. There is some specific	223	* RequestInfo is sort of a meta command. There is some specific
208	* request of information, but we call other functions to provide	224	* request of information, but we call other functions to provide
209	* that information.	225	* that information.
210	*/	226	*/
211	void	227	void
212	RequestInfo (char *buf, int len, client * ns)	228	RequestInfo (char *buf, int len, client *ns)
213	{	229	{
214	char *params = NULL, *cp;	230	char *params;
215
216	/* No match */
217	char bigbuf[MAX_BUF];
218	int slen;
219
220	/* Set up replyinfo before we modify any of the buffers - this is used
221	* if we don't find a match.
222	*/
223	strcpy (bigbuf, "replyinfo ");
224	slen = strlen (bigbuf);
225	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
226		231
227	/* find the first space, make it null, and update the	232	/* find the first space, make it null, and update the
228	* params pointer.	233	* params pointer.
229	*/	234	*/
230	for (cp = buf; *cp != '\0'; cp++)	235	for (params = buf; *params; params++)
231	if (*cp == ' ')	236	if (*params == ' ')
232	{	237	{
233	*cp = '\0';
234	params = cp + 1;	238	*params++ = 0;
235	break;	239	break;
236	}	240	}
237		241
238	if (!strcmp (buf, "image_info"))	242	if (!strcmp (buf, "image_info"))
239	send_image_info (ns, params);	243	send_image_info (ns, params);
…		…
242	else if (!strcmp (buf, "skill_info"))	246	else if (!strcmp (buf, "skill_info"))
243	send_skill_info (ns, params);	247	send_skill_info (ns, params);
244	else if (!strcmp (buf, "spell_paths"))	248	else if (!strcmp (buf, "spell_paths"))
245	send_spell_paths (ns, params);	249	send_spell_paths (ns, params);
246	else	250	else
247	ns->send_packet (bigbuf, len);	251	{
		252	// undo tokenisation above and send replyinfo with the request unchanged
		253	if (*params)
		254	*--params = ' ';
		255
		256	ns->send_packet_printf ("replyinfo %s", buf);
		257	}
248	}	258	}
249		259
250	void	260	void
251	ExtCmd (char *buf, int len, player *pl)	261	ExtCmd (char *buf, int len, player *pl)
252	{	262	{
…		…
255		265
256	void	266	void
257	ExtiCmd (char *buf, int len, client *ns)	267	ExtiCmd (char *buf, int len, client *ns)
258	{	268	{
259	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	269	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		270	}
		271
		272	void
		273	client::mapinfo_queue_clear ()
		274	{
		275	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		276	free (*i);
		277
		278	mapinfo_queue.clear ();
		279	}
		280
		281	bool
		282	client::mapinfo_try (char *buf)
		283	{
		284	char *token = buf;
		285	buf += strlen (buf) + 9;
		286
		287	// initial map and its origin
		288	maptile *map = pl->observe->map;
		289	int mapx = pl->ns->mapx / 2 - pl->observe->x;
		290	int mapy = pl->ns->mapy / 2 - pl->observe->y;
		291	int max_distance = 8; // limit maximum path length to something generous
		292
		293	while (*buf && map && max_distance)
		294	{
		295	int dir = *buf++ - '1';
		296
		297	if (dir >= 0 && dir <= 3)
		298	{
		299	if (!map->tile_path [dir])
		300	map = 0;
		301	else if (map->tile_available (dir, false))
		302	{
		303	maptile *neigh = map->tile_map [dir];
		304
		305	switch (dir)
		306	{
		307	case 0: mapy -= neigh->height; break;
		308	case 2: mapy += map ->height; break;
		309	case 3: mapx -= neigh->width ; break;
		310	case 1: mapx += map ->width ; break;
		311	}
		312
		313	map = neigh;
		314	--max_distance;
		315	}
		316	else
		317	return 0;
		318	}
		319	else
		320	max_distance = 0;
		321	}
		322
		323	if (!max_distance)
		324	send_packet_printf ("mapinfo %s error", token);
		325	else if (!map || !map->path)
		326	send_packet_printf ("mapinfo %s nomap", token);
		327	else
		328	{
		329	int flags = 0;
		330
		331	if (map->tile_path[0]) flags |= 1;
		332	if (map->tile_path[1]) flags |= 2;
		333	if (map->tile_path[2]) flags |= 4;
		334	if (map->tile_path[3]) flags |= 8;
		335
		336	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		337	}
		338
		339	return 1;
		340	}
		341
		342	void
		343	client::mapinfo_queue_run ()
		344	{
		345	if (mapinfo_queue.empty () || !pl)
		346	return;
		347
		348	for (int i = 0; i < mapinfo_queue.size (); ++i)
		349	if (mapinfo_try (mapinfo_queue [i]))
		350	{
		351	free (mapinfo_queue [i]);
		352	mapinfo_queue.erase (i);
		353	}
		354	else
		355	++i;
260	}	356	}
261		357
262	void	358	void
263	MapInfoCmd (char *buf, int len, player *pl)	359	MapInfoCmd (char *buf, int len, player *pl)
264	{	360	{
265	// <mapinfo tag spatial tile-path	361	// <mapinfo tag spatial tile-path
266	// >mapinfo tag spatial flags x y w h hash	362	// >mapinfo tag spatial flags x y w h hash
267		363
268	char bigbuf[MAX_BUF], *token;
269
270	token = buf;	364	char *token = buf;
271	// copy token	365
272	if (!(buf = strchr (buf, ' ')))	366	if (!(buf = strchr (buf, ' ')))
273	return;	367	return;
274		368
275	*buf++ = 0;
276
277	if (!strncmp (buf, "spatial ", 8))	369	if (!strncmp (buf, " spatial ", 9))
278	{	370	{
279	buf += 8;	371	char *copy = strdup (token);
		372	copy [buf - token] = 0;
280		373
281	// initial map and its origin	374	#if 0
282	maptile *map = pl->ob->map;	375	// this makes only sense when we flush the buffer immediately
283	sint16 dx, dy;	376	if (pl->ns->mapinfo_try (copy))
284	int mapx = pl->ns->mapx / 2 - pl->ob->x;	377	free (copy);
285	int mapy = pl->ns->mapy / 2 - pl->ob->y;
286	int max_distance = 8; // limit maximum path length to something generous
287
288	while (*buf && map && max_distance)
289	{
290	int dir = *buf++;
291
292	switch (dir)
293	{
294	case '1':
295	dx = 0;
296	dy = -1;
297	map = map->xy_find (dx, dy);
298	map && (mapy -= map->height);
299	break;
300	case '2':
301	mapx += map->width;
302	dx = map->width;
303	dy = 0;
304	map = map->xy_find (dx, dy);
305	break;
306	case '3':
307	mapy += map->height;
308	dx = 0;
309	dy = map->height;
310	map = map->xy_find (dx, dy);
311	break;
312	case '4':
313	dx = -1;
314	dy = 0;
315	map = map->xy_find (dx, dy);
316	map && (mapx -= map->width);
317	break;
318	}
319
320	--max_distance;
321	}
322
323	if (!max_distance)
324	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325	else if (map && map->path[0])
326	{
327	int flags = 0;
328
329	if (map->tile_path[0])
330	flags |= 1;
331	if (map->tile_path[1])
332	flags |= 2;
333	if (map->tile_path[2])
334	flags |= 4;
335	if (map->tile_path[3])
336	flags |= 8;
337
338	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339	}
340	else	378	else
341	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	379	#endif
		380	pl->ns->mapinfo_queue.push_back (copy);
342	}	381	}
343	else	382	else
344	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	383	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346	pl->ns->send_packet (bigbuf);
347	}	384	}
348		385
349	/** This is the Setup cmd - easy first implementation */	386	/** This is the Setup cmd */
350	void	387	void
351	SetUp (char *buf, int len, client * ns)	388	SetUp (char *buf, int len, client * ns)
352	{	389	{
353	int s, slen;	390	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354	char *cmd, *param, cmdback[HUGE_BUF];
355
356	/* run through the cmds of setup
357	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358	*
359	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360	* The client then must sort this out
361	*/
362
363	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365	strcpy (cmdback, "setup");
366	for (s = 0; s < len; )
367	{
368	cmd = &buf[s];
369
370	/* find the next space, and put a null there */
371	for (; buf[s] && buf[s] != ' '; s++)
372	;
373
374	buf[s++] = 0;
375
376	while (buf[s] == ' ')
377	s++;
378
379	if (s >= len)
380	break;
381
382	param = &buf[s];
383
384	for (; buf[s] && buf[s] != ' '; s++)
385	;
386
387	buf[s++] = 0;
388
389	while (buf[s] == ' ')
390	s++;
391
392	slen = strlen (cmdback);
393	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397	if (!strcmp (cmd, "sound"))
398	{
399	ns->sound = atoi (param);
400	safe_strcat (cmdback, param, &slen, HUGE_BUF);
401	}
402	else if (!strcmp (cmd, "exp64"))
403	safe_strcat (cmdback, param, &slen, HUGE_BUF);
404	else if (!strcmp (cmd, "spellmon"))
405	{
406	ns->monitor_spells = atoi (param);
407	safe_strcat (cmdback, param, &slen, HUGE_BUF);
408	}
409	else if (!strcmp (cmd, "darkness"))
410	{
411	ns->darkness = atoi (param);
412	safe_strcat (cmdback, param, &slen, HUGE_BUF);
413	}
414	else if (!strcmp (cmd, "map1cmd"))
415	{
416	if (atoi (param))
417	ns->mapmode = Map1Cmd;
418	/* if beyond this size, need to use map1cmd no matter what */
419	if (ns->mapx > 11 || ns->mapy > 11)
420	ns->mapmode = Map1Cmd;
421	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422	}
423	else if (!strcmp (cmd, "map1acmd"))
424	{
425	if (atoi (param))
426	ns->mapmode = Map1aCmd;
427	/* if beyond this size, need to use map1acmd no matter what */
428	if (ns->mapx > 11 || ns->mapy > 11)
429	ns->mapmode = Map1aCmd;
430	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431	}
432	else if (!strcmp (cmd, "newmapcmd"))
433	{
434	ns->newmapcmd = atoi (param);
435	safe_strcat (cmdback, param, &slen, HUGE_BUF);
436	}
437	else if (!strcmp (cmd, "mapinfocmd"))
438	{
439	ns->mapinfocmd = atoi (param);
440	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441	}
442	else if (!strcmp (cmd, "extcmd"))
443	{
444	ns->extcmd = atoi (param);
445	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446	}
447	else if (!strcmp (cmd, "extmap"))
448	{
449	ns->extmap = atoi (param);
450	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451	}
452	else if (!strcmp (cmd, "facecache"))
453	{
454	ns->facecache = atoi (param);
455	safe_strcat (cmdback, param, &slen, HUGE_BUF);
456	}
457	else if (!strcmp (cmd, "faceset"))
458	{
459	char tmpbuf[20];
460	int q = atoi (param);
461
462	if (is_valid_faceset (q))
463	ns->faceset = q;
464	sprintf (tmpbuf, "%d", ns->faceset);
465	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466	/* if the client is using faceset, it knows about image2 command */
467	ns->image2 = 1;
468	}
469	else if (!strcmp (cmd, "itemcmd"))
470	{
471	/* Version of the item protocol command to use. Currently,
472	* only supported versions are 1 and 2. Using a numeric
473	* value will make it very easy to extend this in the future.
474	*/
475	char tmpbuf[20];
476	int q = atoi (param);
477
478	if (q < 1 || q > 2)
479	{
480	strcpy (tmpbuf, "FALSE");
481	}
482	else
483	{
484	ns->itemcmd = q;
485	sprintf (tmpbuf, "%d", ns->itemcmd);
486	}
487	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488	}
489	else if (!strcmp (cmd, "mapsize"))
490	{
491	int x, y = 0;
492	char tmpbuf[MAX_BUF], *cp;
493
494	x = atoi (param);
495	for (cp = param; *cp != 0; cp++)
496	if (*cp == 'x' || *cp == 'X')
497	{
498	y = atoi (cp + 1);
499	break;
500	}
501
502	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503	{
504	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506	}
507	else
508	{
509	ns->mapx = x;
510	ns->mapy = y;
511	/* better to send back what we are really using and not the
512	* param as given to us in case it gets parsed differently.
513	*/
514	sprintf (tmpbuf, "%dx%d", x, y);
515	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516	/* If beyond this size and still using orig map command, need to
517	* go to map1cmd.
518	*/
519	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520	ns->mapmode = Map1Cmd;
521	}
522	}
523	else if (!strcmp (cmd, "extendedMapInfos"))
524	{
525	/* Added by tchize
526	* prepare to use the mapextended command
527	*/
528	char tmpbuf[20];
529
530	ns->ext_mapinfos = (atoi (param));
531	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533	}
534	else if (!strcmp (cmd, "extendedTextInfos"))
535	{
536	/* Added by tchize
537	* prepare to use the extended text commands
538	* Client toggle this to non zero to get exttext
539	*/
540	char tmpbuf[20];
541
542	ns->has_readable_type = (atoi (param));
543	sprintf (tmpbuf, "%d", ns->has_readable_type);
544	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545	}
546	else
547	{
548	/* Didn't get a setup command we understood -
549	* report a failure to the client.
550	*/
551	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552	}
553	} /* for processing all the setup commands */
554
555	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556	ns->send_packet (cmdback);
557	}	391	}
558		392
559	/**	393	/**
560	* The client has requested to be added to the game.	394	* The client has requested to be added to the game.
561	* This is what takes care of it. We tell the client how things worked out.	395	* This is what takes care of it. We tell the client how things worked out.
562	* I am not sure if this file is the best place for this function. however,	396	* I am not sure if this file is the best place for this function. however,
563	* it either has to be here or init_sockets needs to be exported.	397	* it either has to be here or init_sockets needs to be exported.
564	*/	398	*/
565	void	399	void
566	AddMeCmd (char *buf, int len, client * ns)	400	AddMeCmd (char *buf, int len, client *ns)
567	{	401	{
568	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	402	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569	}
570
571	/** Reply to ExtendedInfos command */
572	void
573	ToggleExtendedInfos (char *buf, int len, client * ns)
574	{
575	char cmdback[MAX_BUF];
576	char command[50];
577	int info, nextinfo;
578
579	cmdback[0] = '\0';
580	nextinfo = 0;
581
582	while (1)
583	{
584	/* 1. Extract an info */
585	info = nextinfo;
586
587	while ((info < len) && (buf[info] == ' '))
588	info++;
589
590	if (info >= len)
591	break;
592
593	nextinfo = info + 1;
594
595	while ((nextinfo < len) && (buf[nextinfo] != ' '))
596	nextinfo++;
597
598	if (nextinfo - info >= 49) /*Erroneous info asked */
599	continue;
600
601	strncpy (command, &(buf[info]), nextinfo - info);
602
603	/* 2. Interpret info */
604	if (!strcmp ("smooth", command))
605	/* Toggle smoothing */
606	ns->EMI_smooth = !ns->EMI_smooth;
607	else
608	/*bad value */;
609
610	/*3. Next info */
611	}
612
613	strcpy (cmdback, "ExtendedInfoSet");
614
615	if (ns->EMI_smooth)
616	{
617	strcat (cmdback, " ");
618	strcat (cmdback, "smoothing");
619	}
620
621	ns->send_packet (cmdback);
622	}	403	}
623		404
624	/*	405	/*
625	#define MSG_TYPE_BOOK 1	406	#define MSG_TYPE_BOOK 1
626	#define MSG_TYPE_CARD 2	407	#define MSG_TYPE_CARD 2
…		…
644	while (1)	425	while (1)
645	{	426	{
646	/* 1. Extract an info */	427	/* 1. Extract an info */
647	info = nextinfo;	428	info = nextinfo;
648		429
649	while ((info < len) && (buf[info] == ' '))	430	while ((info < len) && (buf [info] == ' '))
650	info++;	431	info++;
651		432
652	if (info >= len)	433	if (info >= len)
653	break;	434	break;
654		435
655	nextinfo = info + 1;	436	nextinfo = info + 1;
656		437
657	while ((nextinfo < len) && (buf[nextinfo] != ' '))	438	while ((nextinfo < len) && (buf [nextinfo] != ' '))
658	nextinfo++;	439	nextinfo++;
659		440
660	if (nextinfo - info >= 49) /*Erroneous info asked */	441	if (nextinfo - info >= 49) /*Erroneous info asked */
661	continue;	442	continue;
662		443
663	strncpy (command, &(buf[info]), nextinfo - info);	444	memcpy (command, buf + info, nextinfo - info);
664	command[nextinfo - info] = '\0';	445	command [nextinfo - info] = 0;
		446
665	/* 2. Interpret info */	447	/* 2. Interpret info */
666	i = sscanf (command, "%d", &flag);	448	i = sscanf (command, "%d", &flag);
667		449
668	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	450	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
669	ns->supported_readables |= (1 << flag);	451	ns->supported_readables |= (1 << flag);
…		…
683		465
684	ns->send_packet (cmdback);	466	ns->send_packet (cmdback);
685	}	467	}
686		468
687	/**	469	/**
688	* A lot like the old AskSmooth (in fact, now called by AskSmooth).
689	* Basically, it makes no sense to wait for the client to request a
690	* a piece of data from us that we know the client wants. So
691	* if we know the client wants it, might as well push it to the
692	* client.
693	*/
694	static void
695	SendSmooth (client *ns, uint16 face)
696	{
697	uint16 smoothface;
698
699	/* If we can't find a face, return and set it so we won't try to send this
700	* again.
701	*/
702	if (!FindSmooth (face, &smoothface))
703	{
704
705	LOG (llevError, "could not findsmooth for %d.\n", face);
706	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
707	return;
708	}
709
710	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
711	esrv_send_face (ns, smoothface, 0);
712
713	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
714
715	packet sl ("smooth");
716
717	sl << uint16 (face)
718	<< uint16 (smoothface);
719
720	ns->send_packet (sl);
721	}
722
723	/**
724	* Tells client the picture it has to use
725	* to smooth a picture number given as argument.
726	*/
727	void
728	AskSmooth (char *buf, int len, client *ns)
729	{
730	SendSmooth (ns, atoi (buf));
731	}
732
733	/**
734	* This handles the general commands from the client (ie, north, fire, cast,	470	* This handles the general commands from the client (ie, north, fire, cast,
735	* etc.)	471	* etc.)
736	*/	472	*/
737	void	473	void
738	PlayerCmd (char *buf, int len, player *pl)	474	PlayerCmd (char *buf, int len, player *pl)
…		…
749	return;	485	return;
750		486
751	buf++;	487	buf++;
752	}	488	}
753		489
754	execute_newserver_command (pl->ob, (char *) buf);	490	execute_newserver_command (pl->ob, (char *)buf);
755		491
756	/* Perhaps something better should be done with a left over count.	492	/* Perhaps something better should be done with a left over count.
757	* Cleaning up the input should probably be done first - all actions	493	* Cleaning up the input should probably be done first - all actions
758	* for the command that issued the count should be done before any other	494	* for the command that issued the count should be done before any other
759	* commands.	495	* commands.
760	*/	496	*/
761	pl->count = 0;	497	pl->count = 0;
762	}	498	}
763		499
764
765	/**	500	/**
766	* This handles the general commands from the client (ie, north, fire, cast,	501	* This handles the general commands from the client (ie, north, fire, cast,
767	* etc.). It is a lot like PlayerCmd above, but is called with the	502	* etc.). It is a lot like PlayerCmd above, but is called with the
768	* 'ncom' method which gives more information back to the client so it	503	* 'ncom' method which gives more information back to the client so it
769	* can throttle.	504	* can throttle.
…		…
771	void	506	void
772	NewPlayerCmd (char *buf, int len, player *pl)	507	NewPlayerCmd (char *buf, int len, player *pl)
773	{	508	{
774	if (len <= 6)	509	if (len <= 6)
775	{	510	{
776	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	511	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
777	return;	512	return;
778	}	513	}
779		514
780	uint16 cmdid = net_uint16 ((uint8 *)buf);	515	uint16 cmdid = net_uint16 ((uint8 *)buf);
781	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	516	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
838	{	573	{
839	case ST_PLAYING:	574	case ST_PLAYING:
840	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	575	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
841	break;	576	break;
842		577
843	case ST_CHANGE_CLASS:
844	key_change_class (pl->ob, buf[0]);
845	break;
846
847	case ST_GET_PARTY_PASSWORD: /* Get password for party */	578	case ST_GET_PARTY_PASSWORD: /* Get password for party */
848	receive_party_password (pl->ob, 13);	579	receive_party_password (pl->ob, 13);
849	break;	580	break;
850		581
851	default:	582	default:
…		…
890		621
891	cp = strchr (cp + 1, ' ');	622	cp = strchr (cp + 1, ' ');
892		623
893	if (cp)	624	if (cp)
894	{	625	{
895	assign (ns->version, cp + 1);	626	ns->version = cp + 1;
896		627
897	if (ns->sc_version < 1026)	628	if (ns->sc_version < 1026)
898	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	629	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
899	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	630	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
900	}	631	}
…		…
923	* syntax is: move (to) (tag) (nrof)	654	* syntax is: move (to) (tag) (nrof)
924	*/	655	*/
925	void	656	void
926	MoveCmd (char *buf, int len, player *pl)	657	MoveCmd (char *buf, int len, player *pl)
927	{	658	{
928	int vals[3], i;	659	int to, tag, nrof;
929		660
930	/* A little funky here. We only cycle for 2 records, because	661	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
931	* we obviously are not going to find a space after the third
932	* record. Perhaps we should just replace this with a
933	* sscanf?
934	*/
935	for (i = 0; i < 2; i++)
936	{	662	{
937	vals[i] = atoi (buf);
938
939	if (!(buf = strchr (buf, ' ')))
940	{
941	LOG (llevError, "Incomplete move command: %s\n", buf);	663	LOG (llevError, "Incomplete move command: %s\n", buf);
942	return;	664	return;
943	}
944
945	buf++;
946	}	665	}
947		666
948	vals[2] = atoi (buf);	667	esrv_move_object (pl->ob, to, tag, nrof);
949
950	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
951	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
952	}	668	}
953		669
954	/******************************************************************************	670	/******************************************************************************
955	*	671	*
956	* Start of commands the server sends to the client.	672	* Start of commands the server sends to the client.
…		…
960	/**	676	/**
961	* Asks the client to query the user. This way, the client knows	677	* Asks the client to query the user. This way, the client knows
962	* it needs to send something back (vs just printing out a message)	678	* it needs to send something back (vs just printing out a message)
963	*/	679	*/
964	void	680	void
965	send_query (client *ns, uint8 flags, char *text)	681	send_query (client *ns, uint8 flags, const char *text)
966	{	682	{
967	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	683	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
		684	}
		685
		686	/**
		687	* Get player's current range attack in obuf.
		688	*/
		689	static void
		690	rangetostring (player *pl, char *obuf)
		691	{
		692	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		693
		694	if (pl->ranged_ob)
		695	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		696
		697	if (pl->combat_ob)
		698	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		699
		700	#if 0
		701	//TODO: remove this when slot system is working, this is only for debugging
		702	if (pl->ob->chosen_skill)
		703	buf << " Skill*: " << pl->ob->chosen_skill->name;
		704	#endif
		705
		706	//TODO: maybe golem should become the current_weapon, quite simply?
		707	if (pl->golem)
		708	buf << " Golem*: " << pl->golem->name;
		709
		710	buf << '\0';
		711	buf.linearise (obuf);
968	}	712	}
969		713
970	#define AddIfInt64(Old,New,Type) if (Old != New) {\	714	#define AddIfInt64(Old,New,Type) if (Old != New) {\
971	Old = New; \	715	Old = New; \
972	sl << uint8 (Type) << uint64 (New); \	716	sl << uint8 (Type) << uint64 (New); \
…		…
980	#define AddIfShort(Old,New,Type) if (Old != New) {\	724	#define AddIfShort(Old,New,Type) if (Old != New) {\
981	Old = New; \	725	Old = New; \
982	sl << uint8 (Type) << uint16 (New); \	726	sl << uint8 (Type) << uint16 (New); \
983	}	727	}
984		728
985	#define AddIfFloat(Old,New,Type) if (Old != New) {\	729	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
986	Old = New; \	730	Old = New; \
987	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	731	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
988	}	732	}
989		733
990	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	734	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
991	free(Old); Old = strdup (New);\	735	free(Old); Old = strdup (New);\
992	sl << uint8 (Type) << data8 (New); \	736	sl << uint8 (Type) << data8 (New); \
…		…
1006		750
1007	client *ns = pl->ns;	751	client *ns = pl->ns;
1008	if (!ns)	752	if (!ns)
1009	return;	753	return;
1010		754
1011	object *ob = pl->ob;	755	object *ob = pl->observe;
1012	if (!ob)	756	if (!ob)
1013	return;	757	return;
		758
		759	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1014		760
1015	packet sl ("stats");	761	packet sl ("stats");
1016		762
1017	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	763	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1018	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	764	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
1027	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	773	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1028	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	774	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1029	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	775	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1030		776
1031	for (int s = 0; s < NUM_SKILLS; s++)	777	for (int s = 0; s < NUM_SKILLS; s++)
1032	if (object *skill = pl->last_skill_ob[s])	778	if (object *skill = opl->last_skill_ob [s])
1033	if (skill->stats.exp != ns->last_skill_exp [s])	779	if (skill->stats.exp != ns->last_skill_exp [s])
1034	{	780	{
1035	ns->last_skill_exp [s] = skill->stats.exp;	781	ns->last_skill_exp [s] = skill->stats.exp;
1036		782
1037	/* Always send along the level if exp changes. This is only	783	/* Always send along the level if exp changes. This is only
…		…
1045	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	791	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1046	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	792	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1047	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	793	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1048	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	794	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1049	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	795	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1050	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	796	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1051	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	797	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1052	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	798	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1053	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	799	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1054		800
1055	flags = 0;	801	flags = 0;
1056		802
1057	if (pl->fire_on)	803	if (opl->fire_on)
1058	flags |= SF_FIREON;	804	flags |= SF_FIREON;
1059		805
1060	if (pl->run_on)	806	if (opl->run_on)
1061	flags |= SF_RUNON;	807	flags |= SF_RUNON;
1062		808
1063	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	809	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1064		810
1065	if (ns->sc_version < 1025)	811	if (ns->sc_version < 1025)
…		…
1079	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	825	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1080	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	826	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1081	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	827	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1082	}	828	}
1083		829
1084	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	830	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1085	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	831	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1086	set_title (ob, buf);	832	set_title (ob, buf);
1087	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	833	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1088		834
1089	/* Only send it away if we have some actual data */	835	/* Only send it away if we have some actual data */
…		…
1093		839
1094	/**	840	/**
1095	* Tells the client that here is a player it should start using.	841	* Tells the client that here is a player it should start using.
1096	*/	842	*/
1097	void	843	void
1098	esrv_new_player (player *pl, uint32 weight)	844	esrv_new_player (player *pl)
1099	{	845	{
		846	sint32 weight = pl->ob->client_weight ();
		847
1100	packet sl ("player");	848	packet sl ("player");
1101		849
1102	sl << uint32 (pl->ob->count)	850	sl << uint32 (pl->ob->count)
1103	<< uint32 (weight)	851	<< uint32 (weight)
1104	<< uint32 (pl->ob->face)	852	<< uint32 (pl->ob->face)
1105	<< data8 (pl->ob->name);	853	<< data8 (pl->ob->name);
1106		854
1107	pl->ns->last_weight = weight;	855	pl->ns->last_weight = weight;
1108	pl->ns->send_packet (sl);	856	pl->ns->send_packet (sl);
1109	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1110	}	857	}
1111
1112	/**
1113	* Need to send an animation sequence to the client.
1114	* We will send appropriate face commands to the client if we haven't
1115	* sent them the face yet (this can become quite costly in terms of
1116	* how much we are sending - on the other hand, this should only happen
1117	* when the player logs in and picks stuff up.
1118	*/
1119	void
1120	esrv_send_animation (client * ns, short anim_num)
1121	{
1122	/* Do some checking on the anim_num we got. Note that the animations
1123	* are added in contigous order, so if the number is in the valid
1124	* range, it must be a valid animation.
1125	*/
1126	if (anim_num < 0 || anim_num > num_animations)
1127	{
1128	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1129	return;
1130	}
1131
1132	packet sl ("anim");
1133
1134	sl << uint16 (anim_num)
1135	<< uint16 (0); /* flags - not used right now */
1136
1137	/* Build up the list of faces. Also, send any information (ie, the
1138	* the face itself) down to the client.
1139	*/
1140	for (int i = 0; i < animations[anim_num].num_animations; i++)
1141	{
1142	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1143	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1144
1145	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1146	}
1147
1148	ns->send_packet (sl);
1149
1150	ns->anims_sent[anim_num] = 1;
1151	}
1152
1153		858
1154	/******************************************************************************	859	/******************************************************************************
1155	*	860	*
1156	* Start of map related commands.	861	* Start of map related commands.
1157	*	862	*
…		…
1159		864
1160	/** Clears a map cell */	865	/** Clears a map cell */
1161	static void	866	static void
1162	map_clearcell (struct MapCell *cell, int count)	867	map_clearcell (struct MapCell *cell, int count)
1163	{	868	{
1164	cell->faces[0] = 0;	869	cell->faces[0] = 0;
1165	cell->faces[1] = 0;	870	cell->faces[1] = 0;
1166	cell->faces[2] = 0;	871	cell->faces[2] = 0;
		872	cell->smooth[0] = 0;
		873	cell->smooth[1] = 0;
		874	cell->smooth[2] = 0;
1167	cell->count = count;	875	cell->count = count;
1168	cell->stat_hp = 0;	876	cell->stat_hp = 0;
1169	cell->flags = 0;	877	cell->flags = 0;
1170	cell->player = 0;	878	cell->player = 0;
1171	}	879	}
1172		880
1173	#define MAX_LAYERS 3	881	#define MAX_LAYERS 3
1174		882
1175	/**	883	/**
…		…
1178	* it was.	886	* it was.
1179	* sl is the socklist this data is going into.	887	* sl is the socklist this data is going into.
1180	* ns is the socket we are working on - all the info we care	888	* ns is the socket we are working on - all the info we care
1181	* about is in this socket structure, so now need not pass the	889	* about is in this socket structure, so now need not pass the
1182	* entire player object.	890	* entire player object.
1183	* mx and my are map coordinate offsets for map mp
1184	* sx and sy are the offsets into the socket structure that
1185	* holds the old values.
1186	* layer is the layer to update, with 2 being the floor and 0 the	891	* layer is the layer to update, with 2 being the floor and 0 the
1187	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	892	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1188	* take. Interesting to note that before this function, the map1 function	893	* take. Interesting to note that before this function, the map1 function
1189	* numbers the spaces differently - I think this was a leftover from	894	* numbers the spaces differently - I think this was a leftover from
1190	* the map command, where the faces stack up. Sinces that is no longer	895	* the map command, where the faces stack up. Sinces that is no longer
1191	* the case, it seems to make more sense to have these layer values	896	* the case, it seems to make more sense to have these layer values
1192	* actually match.	897	* actually match.
1193	*/	898	*/
1194	static int	899	static int
1195	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	900	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1196	{	901	{
1197	uint16 face_num;	902	object *ob = ms.faces_obj [layer];
1198	int bx, by, i;
1199
1200	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1201		903
1202	/* If there is no object for this space, or if the face for the object	904	/* If there is no object for this space, or if the face for the object
1203	* is the blank face, set the face number to zero.	905	* is the blank face, set the face number to zero.
1204	* else if we have the stored head object for this space, that takes	906	* else if we have the stored head object for this space, that takes
1205	* precedence over the other object for this space.	907	* precedence over the other object for this space.
1206	* otherwise, we do special head processing	908	* otherwise, we do special head processing
1207	*/	909	*/
1208	if (!ob || ob->face == blank_face)	910	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1209	face_num = 0;
1210	else
1211	/* In this case, we are already at the lower right or single part object,
1212	* so nothing special
1213	*/
1214	face_num = ob->face;
1215		911
1216	/* We've gotten what face we want to use for the object. Now see if	912	/* We've gotten what face we want to use for the object. Now see if
1217	* if it has changed since we last sent it to the client.	913	* if it has changed since we last sent it to the client.
1218	*/	914	*/
1219	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	915	if (lastcell.faces[layer] != face_num)
1220	{	916	{
1221	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	917	lastcell.faces[layer] = face_num;
		918
1222	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	919	if (!ns.faces_sent[face_num])
		920	if (ob)
		921	ns.send_faces (ob);
		922	else
1223	esrv_send_face (&ns, face_num, 0);	923	ns.send_face (face_num, 10);
1224		924
1225	sl << uint16 (face_num);	925	sl << uint16 (face_num);
1226	return 1;	926	return 1;
1227	}	927	}
1228		928
1229	/* Nothing changed */	929	/* Nothing changed */
1230	return 0;	930	return 0;
1231	}
1232
1233	/**
1234	* This function is mainly a copy of update_space,
1235	* except it handles update of the smoothing updates,
1236	* not the face updates.
1237	* Removes the need to replicate the same code for each layer.
1238	* this returns true if this smooth is now in fact different
1239	* than it was.
1240	* sl is the socklist this data is going into.
1241	* ns is the socket we are working on - all the info we care
1242	* about is in this socket structure, so know need to pass the
1243	* entire player object.
1244	* mx and my are map coordinate offsets for map mp
1245	* sx and sy are the offsets into the socket structure that
1246	* holds the old values.
1247	* layer is the layer to update, with 2 being the floor and 0 the
1248	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1249	* take.
1250	*/
1251	static inline int
1252	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1253	{
1254	object *ob;
1255	int smoothlevel; /* old face_num; */
1256
1257	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1258
1259	/* If there is no object for this space, or if the face for the object
1260	* is the blank face, set the smoothlevel to zero.
1261	*/
1262	if (!ob || ob->face == blank_face)
1263	smoothlevel = 0;
1264	else
1265	{
1266	smoothlevel = ob->smoothlevel;
1267	if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1268	SendSmooth (&ns, ob->face);
1269	} /* else not already head object or blank face */
1270
1271	/* We've gotten what face we want to use for the object. Now see if
1272	* if it has changed since we last sent it to the client.
1273	*/
1274	if (smoothlevel > 255)
1275	smoothlevel = 255;
1276	else if (smoothlevel < 0)
1277	smoothlevel = 0;
1278
1279	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1280	{
1281	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1282	sl << uint8 (smoothlevel);
1283	return 1;
1284	}
1285
1286	/* Nothing changed */
1287	return 0;
1288	}
1289
1290	/**
1291	* Returns the size of a data for a map square as returned by
1292	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1293	* available.
1294	*/
1295	int
1296	getExtendedMapInfoSize (client * ns)
1297	{
1298	int result = 0;
1299
1300	if (ns->ext_mapinfos)
1301	{
1302	if (ns->EMI_smooth)
1303	result += 1; /*One byte for smoothlevel */
1304	}
1305
1306	return result;
1307	}	931	}
1308		932
1309	// prefetch (and touch) all maps within a specific distancd	933	// prefetch (and touch) all maps within a specific distancd
1310	static void	934	static void
1311	prefetch_surrounding_maps (maptile *map, int distance)	935	prefetch_surrounding_maps (maptile *map, int distance)
1312	{	936	{
1313	map->last_access = runtime;	937	map->touch ();
1314		938
1315	if (--distance)	939	if (--distance)
1316	for (int dir = 4; --dir; )	940	for (int dir = 4; --dir; )
1317	if (const shstr &path = map->tile_path [dir])	941	if (const shstr &path = map->tile_path [dir])
1318	if (maptile *&neigh = map->tile_map [dir])	942	if (maptile *&neigh = map->tile_map [dir])
…		…
1327	{	951	{
1328	prefetch_surrounding_maps (op->map, 3);	952	prefetch_surrounding_maps (op->map, 3);
1329	}	953	}
1330		954
1331	/**	955	/**
1332	* This function uses the new map1 protocol command to send the map	956	* Draws client map.
1333	* to the client. It is necessary because the old map command supports
1334	* a maximum map size of 15x15.
1335	* This function is much simpler than the old one. This is because
1336	* the old function optimized to send as few face identifiers as possible,
1337	* at the expense of sending more coordinate location (coordinates were
1338	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1339	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1340	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1341	* and use the other 4 bits for other informatiion. For full documentation
1342	* of what we send, see the doc/Protocol file.
1343	* I will describe internally what we do:
1344	* the ns->lastmap shows how the map last looked when sent to the client.
1345	* in the lastmap structure, there is a cells array, which is set to the
1346	* maximum viewable size (As set in config.h).
1347	* in the cells, there are faces and a count value.
1348	* we use the count value to hold the darkness value. If -1, then this space
1349	* is not viewable.
1350	* we use faces[0] faces[1] faces[2] to hold what the three layers
1351	* look like.
1352	*/	957	*/
1353	void	958	void
1354	draw_client_map1 (object *pl)	959	draw_client_map (player *pl)
1355	{	960	{
1356	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	961	object *ob = pl->observe;
1357	sint16 nx, ny;
1358	int estartlen, eoldlen;
1359	uint8 eentrysize;
1360	uint16 ewhatstart, ewhatflag;
1361	uint8 extendedinfos;
1362	maptile *m;
1363
1364	client &socket = *pl->contr->ns;
1365
1366	if (!pl->active)	962	if (!ob->active)
1367	return;	963	return;
1368
1369	check_map_change (pl->contr);
1370	prefetch_surrounding_maps (pl);
1371
1372	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1373	packet esl;
1374
1375	startlen = sl.length ();
1376
1377	/*Extendedmapinfo structure initialisation */
1378	if (socket.ext_mapinfos)
1379	{
1380	extendedinfos = EMI_NOREDRAW;
1381
1382	if (socket.EMI_smooth)
1383	extendedinfos |= EMI_SMOOTH;
1384
1385	ewhatstart = esl.length ();
1386	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1387	could need to be taken away */
1388	eentrysize = getExtendedMapInfoSize (&socket);
1389	esl << "mapextended "
1390	<< uint8 (extendedinfos)
1391	<< uint8 (eentrysize);
1392
1393	estartlen = esl.length ();
1394	}
1395	else
1396	{
1397	/* suppress compiler warnings */
1398	ewhatstart = 0;
1399	ewhatflag = 0;
1400	estartlen = 0;
1401	}
1402
1403	/* x,y are the real map locations. ax, ay are viewport relative
1404	* locations.
1405	*/
1406	ay = 0;
1407
1408	/* We could do this logic as conditionals in the if statement,
1409	* but that started to get a bit messy to look at.
1410	*/
1411	max_x = pl->x + (socket.mapx + 1) / 2;
1412	max_y = pl->y + (socket.mapy + 1) / 2;
1413
1414	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1415	{
1416	ax = 0;
1417	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1418	{
1419	int emask, mask;
1420	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1421
1422	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1423
1424	/* If the coordinates are not valid, or it is too dark to see,
1425	* we tell the client as such
1426	*/
1427	nx = x;
1428	ny = y;
1429	m = get_map_from_coord (pl->map, &nx, &ny);
1430
1431	if (!m)
1432	{
1433	/* space is out of map. Update space and clear values
1434	* if this hasn't already been done. If the space is out
1435	* of the map, it shouldn't have a head
1436	*/
1437	if (lastcell.count != -1)
1438	{
1439	sl << uint16 (mask);
1440	map_clearcell (&lastcell, -1);
1441	}
1442
1443	continue;
1444	}
1445
1446	m->touch ();
1447
1448	int d = pl->contr->blocked_los[ax][ay];
1449
1450	if (d > 3)
1451	{
1452
1453	int need_send = 0, count;
1454
1455	/* This block deals with spaces that are not visible for whatever
1456	* reason. Still may need to send the head for this space.
1457	*/
1458
1459	oldlen = sl.length ();
1460
1461	sl << uint16 (mask);
1462
1463	if (lastcell.count != -1)
1464	need_send = 1;
1465
1466	count = -1;
1467
1468	/* properly clear a previously sent big face */
1469	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1470	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1471	need_send = 1;
1472
1473	map_clearcell (&lastcell, count);
1474
1475	if ((mask & 0xf) || need_send)
1476	sl[oldlen + 1] = mask & 0xff;
1477	else
1478	sl.reset (oldlen);
1479	}
1480	else
1481	{
1482	/* In this block, the space is visible.
1483	*/
1484
1485	/* Rather than try to figure out what everything that we might
1486	* need to send is, then form the packet after that,
1487	* we presume that we will in fact form a packet, and update
1488	* the bits by what we do actually send. If we send nothing,
1489	* we just back out sl.length () to the old value, and no harm
1490	* is done.
1491	* I think this is simpler than doing a bunch of checks to see
1492	* what if anything we need to send, setting the bits, then
1493	* doing those checks again to add the real data.
1494	*/
1495	oldlen = sl.length ();
1496	eoldlen = esl.length ();
1497
1498	sl << uint16 (mask);
1499
1500	if (socket.ext_mapinfos)
1501	esl << uint16 (emask);
1502
1503	unsigned char dummy;
1504	unsigned char *last_ext = &dummy;
1505
1506	/* Darkness changed */
1507	if (lastcell.count != d && socket.darkness)
1508	{
1509	mask |= 0x8;
1510
1511	if (socket.extmap)
1512	{
1513	*last_ext |= 0x80;
1514	last_ext = &sl[sl.length ()];
1515	sl << uint8 (d);
1516	}
1517	else
1518	sl << uint8 (255 - 64 * d);
1519	}
1520
1521	lastcell.count = d;
1522
1523	if (socket.extmap)
1524	{
1525	uint8 stat_hp = 0;
1526	uint8 stat_width = 0;
1527	uint8 flags = 0;
1528	UUID player = 0;
1529
1530	// send hp information, if applicable
1531	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
1532	{
1533	if (op->head || op->invisible)
1534	; // do not show
1535	else if (op->type == PLAYER
1536	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1537	{
1538	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1539	{
1540	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1541	stat_width = op->arch->tail_x;
1542	}
1543	}
1544
1545	if (op->msg && op->msg[0] == '@')
1546	flags |= 1;
1547
1548	if (op->type == PLAYER && op != pl)
1549	player = op->count;
1550	}
1551
1552	if (lastcell.stat_hp != stat_hp)
1553	{
1554	lastcell.stat_hp = stat_hp;
1555
1556	mask |= 0x8;
1557	*last_ext |= 0x80;
1558	last_ext = &sl[sl.length ()];
1559
1560	sl << uint8 (5) << uint8 (stat_hp);
1561
1562	if (stat_width > 1)
1563	{
1564	*last_ext |= 0x80;
1565	last_ext = &sl[sl.length ()];
1566
1567	sl << uint8 (6) << uint8 (stat_width);
1568	}
1569	}
1570
1571	if (lastcell.player != player)
1572	{
1573	lastcell.player = player;
1574
1575	mask |= 0x8;
1576	*last_ext |= 0x80;
1577	last_ext = &sl[sl.length ()];
1578
1579	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1580	}
1581
1582	if (lastcell.flags != flags)
1583	{
1584	lastcell.flags = flags;
1585
1586	mask |= 0x8;
1587	*last_ext |= 0x80;
1588	last_ext = &sl[sl.length ()];
1589
1590	sl << uint8 (8) << uint8 (flags);
1591	}
1592	}
1593
1594	/* Floor face */
1595	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
1596	mask |= 0x4;
1597
1598	if (socket.EMI_smooth)
1599	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1600	emask |= 0x4;
1601
1602	/* Middle face */
1603	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
1604	mask |= 0x2;
1605
1606	if (socket.EMI_smooth)
1607	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1608	emask |= 0x2;
1609
1610	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1611	{
1612	if (lastcell.faces[0] != pl->face)
1613	{
1614	lastcell.faces[0] = pl->face;
1615	mask |= 0x1;
1616
1617	if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1618	esrv_send_face (&socket, pl->face, 0);
1619
1620	sl << uint16 (pl->face);
1621	}
1622	}
1623	else
1624	{
1625	/* Top face */
1626	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
1627	mask |= 0x1;
1628
1629	if (socket.EMI_smooth)
1630	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1631	emask |= 0x1;
1632	}
1633
1634	/* Check to see if we are in fact sending anything for this
1635	* space by checking the mask. If so, update the mask.
1636	* if not, reset the len to that from before adding the mask
1637	* value, so we don't send those bits.
1638	*/
1639	if (mask & 0xf)
1640	sl[oldlen + 1] = mask & 0xff;
1641	else
1642	sl.reset (oldlen);
1643
1644	if (emask & 0xf)
1645	esl[eoldlen + 1] = emask & 0xff;
1646	else
1647	esl.reset (eoldlen);
1648	} /* else this is a viewable space */
1649	} /* for x loop */
1650	} /* for y loop */
1651
1652	/* Verify that we in fact do need to send this */
1653	if (socket.ext_mapinfos)
1654	{
1655	if (!(sl.length () > startlen || socket.sent_scroll))
1656	{
1657	/* No map data will follow, so don't say the client
1658	* it doesn't need draw!
1659	*/
1660	ewhatflag &= ~EMI_NOREDRAW;
1661	esl[ewhatstart + 1] = ewhatflag & 0xff;
1662	}
1663
1664	if (esl.length () > estartlen)
1665	socket.send_packet (esl);
1666	}
1667
1668	if (sl.length () > startlen || socket.sent_scroll)
1669	{
1670	socket.send_packet (sl);
1671	socket.sent_scroll = 0;
1672	}
1673	}
1674
1675	/**
1676	* Draws client map.
1677	*/
1678	void
1679	draw_client_map (object *pl)
1680	{
1681	int i, j;
1682	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1683	int mflags;
1684	struct Map newmap;
1685	maptile *m, *pm;
1686
1687	if (pl->type != PLAYER)
1688	{
1689	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1690	return;
1691	}
1692
1693	pm = pl->map;
1694		964
1695	/* If player is just joining the game, he isn't here yet, so the map	965	/* If player is just joining the game, he isn't here yet, so the map
1696	* can get swapped out. If so, don't try to send them a map. All will	966	* can get swapped out. If so, don't try to send them a map. All will
1697	* be OK once they really log in.	967	* be OK once they really log in.
1698	*/	968	*/
1699	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	969	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1700	return;	970	return;
1701		971
1702	memset (&newmap, 0, sizeof (struct Map));	972	int startlen, oldlen;
1703		973
1704	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)	974	check_map_change (pl);
1705	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)	975	prefetch_surrounding_maps (pl->ob);
		976
		977	/* do LOS after calls to update_position */
		978	/* unfortunately, we need to udpate los when observing, currently */
		979	if (pl->do_los || pl->observe != pl->ob)
		980	{
		981	pl->do_los = 0;
		982	pl->update_los ();
		983	}
		984
		985	/**
		986	* This function uses the new map1 protocol command to send the map
		987	* to the client. It is necessary because the old map command supports
		988	* a maximum map size of 15x15.
		989	* This function is much simpler than the old one. This is because
		990	* the old function optimized to send as few face identifiers as possible,
		991	* at the expense of sending more coordinate location (coordinates were
		992	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		993	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		994	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		995	* and use the other 4 bits for other informatiion. For full documentation
		996	* of what we send, see the doc/Protocol file.
		997	* I will describe internally what we do:
		998	* the ns->lastmap shows how the map last looked when sent to the client.
		999	* in the lastmap structure, there is a cells array, which is set to the
		1000	* maximum viewable size (As set in config.h).
		1001	* in the cells, there are faces and a count value.
		1002	* we use the count value to hold the darkness value. If -1, then this space
		1003	* is not viewable.
		1004	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1005	* look like.
		1006	*/
		1007
		1008	client &socket = *pl->ns;
		1009
		1010	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
		1011
		1012	startlen = sl.length ();
		1013
		1014	int hx = socket.mapx / 2;
		1015	int hy = socket.mapy / 2;
		1016
		1017	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
		1018	int ax = dx + hx;
		1019	int ay = dy + hy;
		1020
		1021	int mask = (ax << 10) | (ay << 4);
		1022	MapCell &lastcell = socket.lastmap.cells[ax][ay];
		1023
		1024	/* If the coordinates are not valid, or it is too dark to see,
		1025	* we tell the client as such
		1026	*/
		1027	if (!m)
1706	{	1028	{
1707	ax = i;	1029	/* space is out of map. Update space and clear values
1708	ay = j;	1030	* if this hasn't already been done. If the space is out
1709	m = pm;	1031	* of the map, it shouldn't have a head.
1710	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1711
1712	if (mflags & P_OUT_OF_MAP)
1713	continue;
1714
1715	/* If a map is visible to the player, we don't want to swap it out
1716	* just to reload it. This should really call something like
1717	* swap_map, but this is much more efficient and 'good enough'
1718	*/	1032	*/
1719	if (mflags & P_NEW_MAP)	1033	if (lastcell.count != -1)
1720	m->timeout = 50;	1034	{
		1035	sl << uint16 (mask);
		1036	map_clearcell (&lastcell, -1);
		1037	}
		1038
		1039	continue;
1721	}	1040	}
		1041
		1042	int d = pl->blocked_los_uc (dx, dy);
1722		1043
1723	/* do LOS after calls to update_position */	1044	if (d > 3)
1724	if (pl->contr->do_los)
1725	{	1045	{
1726	update_los (pl);	1046	/* This block deals with spaces that are not visible for whatever
1727	pl->contr->do_los = 0;	1047	* reason. Still may need to send the head for this space.
		1048	*/
		1049	if (lastcell.count != -1
		1050	|| lastcell.faces[0]
		1051	|| lastcell.faces[1]
		1052	|| lastcell.faces[2]
		1053	|| lastcell.stat_hp
		1054	|| lastcell.flags
		1055	|| lastcell.player)
		1056	sl << uint16 (mask);
		1057
		1058	/* properly clear a previously sent big face */
		1059	map_clearcell (&lastcell, -1);
1728	}	1060	}
		1061	else
		1062	{
		1063	/* In this block, the space is visible.
		1064	*/
1729		1065
1730	/* Big maps need a different drawing mechanism to work */	1066	/* Rather than try to figure out what everything that we might
1731	draw_client_map1 (pl);	1067	* need to send is, then form the packet after that,
1732	}	1068	* we presume that we will in fact form a packet, and update
		1069	* the bits by what we do actually send. If we send nothing,
		1070	* we just back out sl.length () to the old value, and no harm
		1071	* is done.
		1072	* I think this is simpler than doing a bunch of checks to see
		1073	* what if anything we need to send, setting the bits, then
		1074	* doing those checks again to add the real data.
		1075	*/
		1076	oldlen = sl.length ();
1733		1077
		1078	sl << uint16 (mask);
		1079
		1080	unsigned char dummy;
		1081	unsigned char *last_ext = &dummy;
		1082
		1083	/* Darkness changed */
		1084	if (lastcell.count != d)
		1085	{
		1086	mask |= 0x8;
		1087
		1088	*last_ext |= 0x80;
		1089	last_ext = &sl[sl.length ()];
		1090	sl << uint8 (d);
		1091	}
		1092
		1093	lastcell.count = d;
		1094
		1095	mapspace &ms = m->at (nx, ny);
		1096	ms.update ();
		1097
		1098	// extmap handling
		1099	uint8 stat_hp = 0;
		1100	uint8 stat_width = 0;
		1101	uint8 flags = 0;
		1102	tag_t player = 0;
		1103
		1104	// send hp information, if applicable
		1105	if (object *op = ms.faces_obj [0])
		1106	if (op->is_head () && !op->invisible)
		1107	{
		1108	if (op->stats.maxhp > op->stats.hp
		1109	&& op->stats.maxhp > 0
		1110	&& (op->type == PLAYER
		1111	|| op->type == DOOR // does not work, have maxhp 0
		1112	|| QUERY_FLAG (op, FLAG_MONSTER)
		1113	|| QUERY_FLAG (op, FLAG_ALIVE)
		1114	|| QUERY_FLAG (op, FLAG_GENERATOR)))
		1115	{
		1116	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1117	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1118	}
		1119
		1120	if (expect_false (op->has_dialogue ()))
		1121	flags |= 1;
		1122
		1123	if (expect_false (op->type == PLAYER))
		1124	player = op == ob ? pl->ob->count
		1125	: op == pl->ob ? ob->count
		1126	: op->count;
		1127	}
		1128
		1129	if (expect_false (lastcell.stat_hp != stat_hp))
		1130	{
		1131	lastcell.stat_hp = stat_hp;
		1132
		1133	mask |= 0x8;
		1134	*last_ext |= 0x80;
		1135	last_ext = &sl[sl.length ()];
		1136
		1137	sl << uint8 (5) << uint8 (stat_hp);
		1138
		1139	if (stat_width > 1)
		1140	{
		1141	*last_ext |= 0x80;
		1142	last_ext = &sl[sl.length ()];
		1143
		1144	sl << uint8 (6) << uint8 (stat_width);
		1145	}
		1146	}
		1147
		1148	if (expect_false (lastcell.player != player))
		1149	{
		1150	lastcell.player = player;
		1151
		1152	mask |= 0x8;
		1153	*last_ext |= 0x80;
		1154	last_ext = &sl[sl.length ()];
		1155
		1156	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
		1157	}
		1158
		1159	if (expect_false (lastcell.flags != flags))
		1160	{
		1161	lastcell.flags = flags;
		1162
		1163	mask |= 0x8;
		1164	*last_ext |= 0x80;
		1165	last_ext = &sl[sl.length ()];
		1166
		1167	sl << uint8 (8) << uint8 (flags);
		1168	}
		1169
		1170	// faces
		1171
		1172	/* Floor face */
		1173	if (update_space (sl, socket, ms, lastcell, 2))
		1174	mask |= 0x4;
		1175
		1176	/* Middle face */
		1177	if (update_space (sl, socket, ms, lastcell, 1))
		1178	mask |= 0x2;
		1179
		1180	if (expect_false (ob->invisible)
		1181	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
		1182	&& ms.player () == ob)
		1183	{
		1184	// force player to be visible to himself if invisible
		1185	if (lastcell.faces[0] != ob->face)
		1186	{
		1187	lastcell.faces[0] = ob->face;
		1188
		1189	mask |= 0x1;
		1190	sl << uint16 (ob->face);
		1191
		1192	socket.send_faces (ob);
		1193	}
		1194	}
		1195	/* Top face */
		1196	else if (update_space (sl, socket, ms, lastcell, 0))
		1197	mask |= 0x1;
		1198
		1199	/* Check to see if we are in fact sending anything for this
		1200	* space by checking the mask. If so, update the mask.
		1201	* if not, reset the len to that from before adding the mask
		1202	* value, so we don't send those bits.
		1203	*/
		1204	if (mask & 0xf)
		1205	sl[oldlen + 1] = mask & 0xff;
		1206	else
		1207	sl.reset (oldlen);
		1208	} /* else this is a viewable space */
		1209	ordered_mapwalk_end
		1210
		1211	socket.flush_fx ();
		1212
		1213	if (sl.length () > startlen || socket.sent_scroll)
		1214	{
		1215	socket.send_packet (sl);
		1216	socket.sent_scroll = 0;
		1217	}
		1218	}
1734		1219
1735	/*****************************************************************************/	1220	/*****************************************************************************/
1736
1737	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1221	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1738
1739	/* a player. Of course, the client need to know the command to be able to */	1222	/* a player. Of course, the client need to know the command to be able to */
1740
1741	/* manage it ! */	1223	/* manage it ! */
1742
1743	/*****************************************************************************/	1224	/*****************************************************************************/
1744	void	1225	void
1745	send_plugin_custom_message (object *pl, char *buf)	1226	send_plugin_custom_message (object *pl, char *buf)
1746	{	1227	{
1747	pl->contr->ns->send_packet (buf);	1228	pl->contr->ns->send_packet (buf);
…		…
1756	{	1237	{
1757	packet sl;	1238	packet sl;
1758	sl << "replyinfo skill_info\n";	1239	sl << "replyinfo skill_info\n";
1759		1240
1760	for (int i = 1; i < NUM_SKILLS; i++)	1241	for (int i = 1; i < NUM_SKILLS; i++)
1761	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1242	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1762		1243
1763	if (sl.length () >= MAXSOCKBUF)	1244	if (sl.length () > MAXSOCKBUF)
1764	{	1245	{
1765	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1246	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1766	fatal (0);	1247	fatal (0);
1767	}	1248	}
1768		1249
…		…
1781	sl << "replyinfo spell_paths\n";	1262	sl << "replyinfo spell_paths\n";
1782		1263
1783	for (int i = 0; i < NRSPELLPATHS; i++)	1264	for (int i = 0; i < NRSPELLPATHS; i++)
1784	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1265	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1785		1266
1786	if (sl.length () >= MAXSOCKBUF)	1267	if (sl.length () > MAXSOCKBUF)
1787	{	1268	{
1788	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1269	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1789	fatal (0);	1270	fatal (0);
1790	}	1271	}
1791		1272
…		…
1810	if (spell->type == SPELL)	1291	if (spell->type == SPELL)
1811	{	1292	{
1812	int flags = 0;	1293	int flags = 0;
1813		1294
1814	/* check if we need to update it */	1295	/* check if we need to update it */
1815	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1296	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1816	{	1297	{
1817	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1298	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1818	flags |= UPD_SP_MANA;	1299	flags |= UPD_SP_MANA;
1819	}	1300	}
1820		1301
1821	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1302	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1822	{	1303	{
1823	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1304	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1824	flags |= UPD_SP_GRACE;	1305	flags |= UPD_SP_GRACE;
1825	}	1306	}
1826		1307
1827	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1308	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1828	{	1309	{
1829	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1310	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1830	flags |= UPD_SP_DAMAGE;	1311	flags |= UPD_SP_DAMAGE;
1831	}	1312	}
1832		1313
1833	if (flags)	1314	if (flags)
1834	{	1315	{
…		…
1836		1317
1837	sl << "updspell "	1318	sl << "updspell "
1838	<< uint8 (flags)	1319	<< uint8 (flags)
1839	<< uint32 (spell->count);	1320	<< uint32 (spell->count);
1840		1321
1841	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1322	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1842	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1323	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1843	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1324	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1844		1325
1845	pl->ns->send_packet (sl);	1326	pl->ns->send_packet (sl);
1846	}	1327	}
1847	}	1328	}
1848	}	1329	}
…		…
1878	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1359	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1879	return;	1360	return;
1880	}	1361	}
1881		1362
1882	/* store costs and damage in the object struct, to compare to later */	1363	/* store costs and damage in the object struct, to compare to later */
1883	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1364	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1884	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1365	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1885	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1366	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1886		1367
1887	/* figure out which skill it uses, if it uses one */	1368	/* figure out which skill it uses, if it uses one */
1888	if (spell->skill)	1369	if (spell->skill)
1889	{	1370	if (object *tmp = pl->find_skill (spell->skill))
1890	for (i = 1; i < NUM_SKILLS; i++)
1891	if (!strcmp (spell->skill, skill_names[i]))
1892	{
1893	skill = i + CS_STAT_SKILLINFO;	1371	skill = tmp->subtype + CS_STAT_SKILLINFO;
1894	break;
1895	}
1896	}
1897		1372
1898	// spells better have a face	1373	// spells better have a face
1899	if (!spell->face)	1374	if (!spell->face)
1900	{	1375	{
1901	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1376	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1902	spell->face = face_find ("burnout.x11", blank_face);	1377	spell->face = face_find ("burnout.x11", blank_face);
1903	}	1378	}
		1379
		1380	pl->ns->send_face (spell->face);
1904		1381
1905	/* send the current values */	1382	/* send the current values */
1906	sl << uint32 (spell->count)	1383	sl << uint32 (spell->count)
1907	<< uint16 (spell->level)	1384	<< uint16 (spell->level)
1908	<< uint16 (spell->casting_time)	1385	<< uint16 (spell->casting_time)
1909	<< uint16 (spell->last_sp)	1386	<< uint16 (spell->cached_sp)
1910	<< uint16 (spell->last_grace)	1387	<< uint16 (spell->cached_grace)
1911	<< uint16 (spell->last_eat)	1388	<< uint16 (spell->cached_eat)
1912	<< uint8 (skill)	1389	<< uint8 (skill)
1913	<< uint32 (spell->path_attuned)	1390	<< uint32 (spell->path_attuned)
1914	<< uint32 (spell->face)	1391	<< uint32 (spell->face)
1915	<< data8 (spell->name)	1392	<< data8 (spell->name)
1916	<< data16 (spell->msg);	1393	<< data16 (spell->msg);
…		…
1944	* bytes and 3 strings (because that is the spec) so we need to	1421	* bytes and 3 strings (because that is the spec) so we need to
1945	* check that the length of those 3 strings, plus the 23 bytes,	1422	* check that the length of those 3 strings, plus the 23 bytes,
1946	* won't take us over the length limit for the socket, if it does,	1423	* won't take us over the length limit for the socket, if it does,
1947	* we need to send what we already have, and restart packet formation	1424	* we need to send what we already have, and restart packet formation
1948	*/	1425	*/
		1426	if (spell->type != SPELL)
		1427	continue;
		1428
1949	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1429	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1950	* to show add_spell is 26 bytes + 2 strings. However, the overun	1430	* to show add_spell is 26 bytes + 2 strings. However, the overun
1951	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1431	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1952	* like it will fix this	1432	* like it will fix this
1953	*/	1433	*/
1954	if (spell->type != SPELL)
1955	continue;
1956
1957	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1434	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1958	{	1435	{
		1436	pl->ns->flush_fx ();
1959	pl->ns->send_packet (sl);	1437	pl->ns->send_packet (sl);
1960		1438
1961	sl.reset ();	1439	sl.reset ();
1962	sl << "addspell ";	1440	sl << "addspell ";
1963	}	1441	}
…		…
1971	return;	1449	return;
1972	}	1450	}
1973	else	1451	else
1974	append_spell (pl, sl, spell);	1452	append_spell (pl, sl, spell);
1975		1453
1976	if (sl.length () >= MAXSOCKBUF)	1454	if (sl.length () > MAXSOCKBUF)
1977	{	1455	{
1978	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1456	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1979	fatal (0);	1457	fatal (0);
1980	}	1458	}
1981		1459
1982	/* finally, we can send the packet */	1460	/* finally, we can send the packet */
		1461	pl->ns->flush_fx ();
1983	pl->ns->send_packet (sl);	1462	pl->ns->send_packet (sl);
1984	}	1463	}
1985		1464

Diff Legend

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