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

Diff Legend

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