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.74 by root, Wed Mar 14 01:19:10 2007 UTC vs.
Revision 1.147 by root, Sat Dec 27 08:41:44 2008 UTC

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

Diff Legend

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