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.125 by root, Tue Apr 22 04:33:20 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 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.
…		…
98	* that much difference in bandwidth.	97	* that much difference in bandwidth.
99	*/	98	*/
100	mx = ns->mapx;	99	mx = ns->mapx;
101	my = ns->mapy;	100	my = ns->mapy;
102		101
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	102	/* 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,	103	* (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	104	* if the destination x or y coordinate is outside the viewable
112	* area, we clear the values - otherwise, the old values	105	* area, we clear the values - otherwise, the old values
113	* 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.
…		…
136	}	129	}
137		130
138	static void	131	static void
139	clear_map (player *pl)	132	clear_map (player *pl)
140	{	133	{
		134	pl->ns->mapinfo_queue_clear ();
		135
141	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	136	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
		137
		138	pl->ns->force_newmap = false;
142		139
143	if (pl->ns->newmapcmd == 1)	140	if (pl->ns->newmapcmd == 1)
144	pl->ns->send_packet ("newmap");	141	pl->ns->send_packet ("newmap");
145		142
146	pl->ns->floorbox_reset ();	143	pl->ns->floorbox_reset ();
…		…
149	/** check for map/region change and send new map data */	146	/** check for map/region change and send new map data */
150	static void	147	static void
151	check_map_change (player *pl)	148	check_map_change (player *pl)
152	{	149	{
153	client &socket = *pl->ns;	150	client &socket = *pl->ns;
154	object *ob = pl->ob;	151	object *ob = pl->observe;
155	char buf[MAX_BUF]; /* eauugggh */
156		152
157	if (socket.current_map != ob->map)	153	if (socket.current_map != ob->map || socket.force_newmap)
158	{	154	{
		155	clear_map (pl);
159	socket.current_map = ob->map;	156	socket.current_map = ob->map;
160
161	clear_map (pl);
162		157
163	if (socket.mapinfocmd)	158	if (socket.mapinfocmd)
164	{	159	{
165	if (ob->map && ob->map->path[0])	160	if (ob->map && ob->map->path[0])
166	{	161	{
167	int flags = 0;	162	int flags = 0;
168		163
169	if (ob->map->tile_path[0])	164	if (ob->map->tile_path[0]) flags |= 1;
170	flags |= 1;
171	if (ob->map->tile_path[1])	165	if (ob->map->tile_path[1]) flags |= 2;
172	flags |= 2;
173	if (ob->map->tile_path[2])	166	if (ob->map->tile_path[2]) flags |= 4;
174	flags |= 4;
175	if (ob->map->tile_path[3])	167	if (ob->map->tile_path[3]) flags |= 8;
176	flags |= 8;
177		168
178	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	169	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
179	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);	170	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		171	ob->map->width, ob->map->height, &ob->map->path);
180	}	172	}
181	else	173	else
182	snprintf (buf, MAX_BUF, "mapinfo current");
183
184	socket.send_packet (buf);	174	socket.send_packet ("mapinfo current");
185	}	175	}
186	}	176	}
187	else if (socket.current_x != ob->x || socket.current_y != ob->y)	177	else if (socket.current_x != ob->x || socket.current_y != ob->y)
188	{	178	{
189	int dx = ob->x - socket.current_x;	179	int dx = ob->x - socket.current_x;
…		…
202	socket.current_y = ob->y;	192	socket.current_y = ob->y;
203		193
204	region *reg = ob->region ();	194	region *reg = ob->region ();
205	if (socket.current_region != reg)	195	if (socket.current_region != reg)
206	{	196	{
		197	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
207	socket.current_region = reg;	198	socket.current_region = reg;
208	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
209	}	199	}
210	}	200	}
211		201
212	/**	202	/**
213	* RequestInfo is sort of a meta command. There is some specific	203	* RequestInfo is sort of a meta command. There is some specific
214	* request of information, but we call other functions to provide	204	* request of information, but we call other functions to provide
215	* that information.	205	* that information.
216	*/	206	*/
217	void	207	void
218	RequestInfo (char *buf, int len, client * ns)	208	RequestInfo (char *buf, int len, client *ns)
219	{	209	{
220	char *params = NULL, *cp;	210	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		211
233	/* find the first space, make it null, and update the	212	/* find the first space, make it null, and update the
234	* params pointer.	213	* params pointer.
235	*/	214	*/
236	for (cp = buf; *cp != '\0'; cp++)	215	for (params = buf; *params; params++)
237	if (*cp == ' ')	216	if (*params == ' ')
238	{	217	{
239	*cp = '\0';
240	params = cp + 1;	218	*params++ = 0;
241	break;	219	break;
242	}	220	}
243		221
244	if (!strcmp (buf, "image_info"))	222	if (!strcmp (buf, "image_info"))
245	send_image_info (ns, params);	223	send_image_info (ns, params);
…		…
248	else if (!strcmp (buf, "skill_info"))	226	else if (!strcmp (buf, "skill_info"))
249	send_skill_info (ns, params);	227	send_skill_info (ns, params);
250	else if (!strcmp (buf, "spell_paths"))	228	else if (!strcmp (buf, "spell_paths"))
251	send_spell_paths (ns, params);	229	send_spell_paths (ns, params);
252	else	230	else
253	ns->send_packet (bigbuf, len);	231	{
		232	// undo tokenisation above and send replyinfo with the request unchanged
		233	if (*params)
		234	*--params = ' ';
		235
		236	ns->send_packet_printf ("replyinfo %s", buf);
		237	}
254	}	238	}
255		239
256	void	240	void
257	ExtCmd (char *buf, int len, player *pl)	241	ExtCmd (char *buf, int len, player *pl)
258	{	242	{
…		…
261		245
262	void	246	void
263	ExtiCmd (char *buf, int len, client *ns)	247	ExtiCmd (char *buf, int len, client *ns)
264	{	248	{
265	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	249	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		250	}
		251
		252	void
		253	client::mapinfo_queue_clear ()
		254	{
		255	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		256	free (*i);
		257
		258	mapinfo_queue.clear ();
		259	}
		260
		261	bool
		262	client::mapinfo_try (char *buf)
		263	{
		264	char *token = buf;
		265	buf += strlen (buf) + 9;
		266
		267	// initial map and its origin
		268	maptile *map = pl->observe->map;
		269	int mapx = pl->ns->mapx / 2 - pl->observe->x;
		270	int mapy = pl->ns->mapy / 2 - pl->observe->y;
		271	int max_distance = 8; // limit maximum path length to something generous
		272
		273	while (*buf && map && max_distance)
		274	{
		275	int dir = *buf++ - '1';
		276
		277	if (dir >= 0 && dir <= 3)
		278	{
		279	if (!map->tile_path [dir])
		280	map = 0;
		281	else if (map->tile_available (dir, false))
		282	{
		283	maptile *neigh = map->tile_map [dir];
		284
		285	switch (dir)
		286	{
		287	case 0: mapy -= neigh->height; break;
		288	case 2: mapy += map ->height; break;
		289	case 3: mapx -= neigh->width ; break;
		290	case 1: mapx += map ->width ; break;
		291	}
		292
		293	map = neigh;
		294	--max_distance;
		295	}
		296	else
		297	return 0;
		298	}
		299	else
		300	max_distance = 0;
		301	}
		302
		303	if (!max_distance)
		304	send_packet_printf ("mapinfo %s error", token);
		305	else if (!map || !map->path)
		306	send_packet_printf ("mapinfo %s nomap", token);
		307	else
		308	{
		309	int flags = 0;
		310
		311	if (map->tile_path[0]) flags |= 1;
		312	if (map->tile_path[1]) flags |= 2;
		313	if (map->tile_path[2]) flags |= 4;
		314	if (map->tile_path[3]) flags |= 8;
		315
		316	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		317	}
		318
		319	return 1;
		320	}
		321
		322	void
		323	client::mapinfo_queue_run ()
		324	{
		325	if (mapinfo_queue.empty () || !pl)
		326	return;
		327
		328	for (int i = 0; i < mapinfo_queue.size (); ++i)
		329	if (mapinfo_try (mapinfo_queue [i]))
		330	{
		331	free (mapinfo_queue [i]);
		332	mapinfo_queue.erase (i);
		333	}
		334	else
		335	++i;
266	}	336	}
267		337
268	void	338	void
269	MapInfoCmd (char *buf, int len, player *pl)	339	MapInfoCmd (char *buf, int len, player *pl)
270	{	340	{
271	// <mapinfo tag spatial tile-path	341	// <mapinfo tag spatial tile-path
272	// >mapinfo tag spatial flags x y w h hash	342	// >mapinfo tag spatial flags x y w h hash
273		343
274	char bigbuf[MAX_BUF], *token;
275
276	token = buf;	344	char *token = buf;
277	// copy token	345
278	if (!(buf = strchr (buf, ' ')))	346	if (!(buf = strchr (buf, ' ')))
279	return;	347	return;
280		348
281	*buf++ = 0;
282
283	if (!strncmp (buf, "spatial ", 8))	349	if (!strncmp (buf, " spatial ", 9))
284	{	350	{
285	buf += 8;	351	char *copy = strdup (token);
		352	copy [buf - token] = 0;
286		353
287	// initial map and its origin	354	#if 0
288	maptile *map = pl->ob->map;	355	// this makes only sense when we flush the buffer immediately
289	sint16 dx, dy;	356	if (pl->ns->mapinfo_try (copy))
290	int mapx = pl->ns->mapx / 2 - pl->ob->x;	357	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	358	else
347	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	359	#endif
		360	pl->ns->mapinfo_queue.push_back (copy);
348	}	361	}
349	else	362	else
350	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	363	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
351
352	pl->ns->send_packet (bigbuf);
353	}	364	}
354		365
355	/** This is the Setup cmd - easy first implementation */	366	/** This is the Setup cmd */
356	void	367	void
357	SetUp (char *buf, int len, client * ns)	368	SetUp (char *buf, int len, client * ns)
358	{	369	{
359	int s, slen;	370	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	}	371	}
566		372
567	/**	373	/**
568	* The client has requested to be added to the game.	374	* 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.	375	* 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,	376	* 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.	377	* it either has to be here or init_sockets needs to be exported.
572	*/	378	*/
573	void	379	void
574	AddMeCmd (char *buf, int len, client * ns)	380	AddMeCmd (char *buf, int len, client *ns)
575	{	381	{
576	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	382	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
577	}	383	}
578		384
579	/** Reply to ExtendedInfos command */	385	/** Reply to ExtendedInfos command */
…		…
691		497
692	ns->send_packet (cmdback);	498	ns->send_packet (cmdback);
693	}	499	}
694		500
695	/**	501	/**
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,	502	* This handles the general commands from the client (ie, north, fire, cast,
743	* etc.)	503	* etc.)
744	*/	504	*/
745	void	505	void
746	PlayerCmd (char *buf, int len, player *pl)	506	PlayerCmd (char *buf, int len, player *pl)
…		…
767	* commands.	527	* commands.
768	*/	528	*/
769	pl->count = 0;	529	pl->count = 0;
770	}	530	}
771		531
772
773	/**	532	/**
774	* This handles the general commands from the client (ie, north, fire, cast,	533	* This handles the general commands from the client (ie, north, fire, cast,
775	* etc.). It is a lot like PlayerCmd above, but is called with the	534	* etc.). It is a lot like PlayerCmd above, but is called with the
776	* 'ncom' method which gives more information back to the client so it	535	* 'ncom' method which gives more information back to the client so it
777	* can throttle.	536	* can throttle.
…		…
779	void	538	void
780	NewPlayerCmd (char *buf, int len, player *pl)	539	NewPlayerCmd (char *buf, int len, player *pl)
781	{	540	{
782	if (len <= 6)	541	if (len <= 6)
783	{	542	{
784	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	543	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
785	return;	544	return;
786	}	545	}
787		546
788	uint16 cmdid = net_uint16 ((uint8 *)buf);	547	uint16 cmdid = net_uint16 ((uint8 *)buf);
789	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	548	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
846	{	605	{
847	case ST_PLAYING:	606	case ST_PLAYING:
848	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	607	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
849	break;	608	break;
850		609
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 */	610	case ST_GET_PARTY_PASSWORD: /* Get password for party */
856	receive_party_password (pl->ob, 13);	611	receive_party_password (pl->ob, 13);
857	break;	612	break;
858		613
859	default:	614	default:
…		…
880	ns->cs_version = atoi (buf);	635	ns->cs_version = atoi (buf);
881	ns->sc_version = ns->cs_version;	636	ns->sc_version = ns->cs_version;
882		637
883	LOG (llevDebug, "connection from client <%s>\n", buf);	638	LOG (llevDebug, "connection from client <%s>\n", buf);
884		639
885
886	//TODO: should log here just for statistics	640	//TODO: should log here just for statistics
887		641
888	//if (VERSION_CS != ns->cs_version)	642	//if (VERSION_CS != ns->cs_version)
889	// unchecked;	643	// unchecked;
890		644
…		…
899		653
900	cp = strchr (cp + 1, ' ');	654	cp = strchr (cp + 1, ' ');
901		655
902	if (cp)	656	if (cp)
903	{	657	{
904	assign (ns->version, cp + 1);	658	ns->version = cp + 1;
905		659
906	if (ns->sc_version < 1026)	660	if (ns->sc_version < 1026)
907	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	661	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
908	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	662	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
909	}	663	}
…		…
969	/**	723	/**
970	* Asks the client to query the user. This way, the client knows	724	* Asks the client to query the user. This way, the client knows
971	* it needs to send something back (vs just printing out a message)	725	* it needs to send something back (vs just printing out a message)
972	*/	726	*/
973	void	727	void
974	send_query (client *ns, uint8 flags, char *text)	728	send_query (client *ns, uint8 flags, const char *text)
975	{	729	{
976	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	730	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
		731	}
		732
		733	/**
		734	* Get player's current range attack in obuf.
		735	*/
		736	static void
		737	rangetostring (player *pl, char *obuf)
		738	{
		739	dynbuf_text buf;
		740
		741	if (pl->ranged_ob)
		742	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		743
		744	if (pl->combat_ob)
		745	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		746
		747	#if 0
		748	//TODO: remove this when slot system is working, this is only for debugging
		749	if (pl->ob->chosen_skill)
		750	buf << " Skill*: " << pl->ob->chosen_skill->name;
		751	#endif
		752
		753	//TODO: maybe golem should become the current_weapon, quite simply?
		754	if (pl->golem)
		755	buf << " Golem*: " << pl->golem->name;
		756
		757	buf << '\0';
		758	buf.linearise (obuf);
977	}	759	}
978		760
979	#define AddIfInt64(Old,New,Type) if (Old != New) {\	761	#define AddIfInt64(Old,New,Type) if (Old != New) {\
980	Old = New; \	762	Old = New; \
981	sl << uint8 (Type) << uint64 (New); \	763	sl << uint8 (Type) << uint64 (New); \
…		…
989	#define AddIfShort(Old,New,Type) if (Old != New) {\	771	#define AddIfShort(Old,New,Type) if (Old != New) {\
990	Old = New; \	772	Old = New; \
991	sl << uint8 (Type) << uint16 (New); \	773	sl << uint8 (Type) << uint16 (New); \
992	}	774	}
993		775
994	#define AddIfFloat(Old,New,Type) if (Old != New) {\	776	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
995	Old = New; \	777	Old = New; \
996	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	778	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
997	}	779	}
998		780
999	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	781	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1000	free(Old); Old = strdup (New);\	782	free(Old); Old = strdup (New);\
1001	sl << uint8 (Type) << data8 (New); \	783	sl << uint8 (Type) << data8 (New); \
…		…
1015		797
1016	client *ns = pl->ns;	798	client *ns = pl->ns;
1017	if (!ns)	799	if (!ns)
1018	return;	800	return;
1019		801
1020	object *ob = pl->ob;	802	object *ob = pl->observe;
1021	if (!ob)	803	if (!ob)
1022	return;	804	return;
		805
		806	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1023		807
1024	packet sl ("stats");	808	packet sl ("stats");
1025		809
1026	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	810	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1027	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	811	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
1036	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1037	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1038	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1039		823
1040	for (int s = 0; s < NUM_SKILLS; s++)	824	for (int s = 0; s < NUM_SKILLS; s++)
1041	if (object *skill = pl->last_skill_ob[s])	825	if (object *skill = opl->last_skill_ob[s])
1042	if (skill->stats.exp != ns->last_skill_exp [s])	826	if (skill->stats.exp != ns->last_skill_exp [s])
1043	{	827	{
1044	ns->last_skill_exp [s] = skill->stats.exp;	828	ns->last_skill_exp [s] = skill->stats.exp;
1045		829
1046	/* Always send along the level if exp changes. This is only	830	/* Always send along the level if exp changes. This is only
…		…
1054	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	838	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1055	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	839	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1056	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	840	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1057	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	841	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1058	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	842	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1059	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	843	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1060	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	844	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1061	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	845	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1062	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	846	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1063		847
1064	flags = 0;	848	flags = 0;
1065		849
1066	if (pl->fire_on)	850	if (opl->fire_on)
1067	flags |= SF_FIREON;	851	flags |= SF_FIREON;
1068		852
1069	if (pl->run_on)	853	if (opl->run_on)
1070	flags |= SF_RUNON;	854	flags |= SF_RUNON;
1071		855
1072	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	856	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1073		857
1074	if (ns->sc_version < 1025)	858	if (ns->sc_version < 1025)
…		…
1088	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	872	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);	873	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);	874	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1091	}	875	}
1092		876
1093	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	877	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1094	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	878	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1095	set_title (ob, buf);	879	set_title (ob, buf);
1096	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	880	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1097		881
1098	/* Only send it away if we have some actual data */	882	/* Only send it away if we have some actual data */
…		…
1115		899
1116	pl->ns->last_weight = weight;	900	pl->ns->last_weight = weight;
1117	pl->ns->send_packet (sl);	901	pl->ns->send_packet (sl);
1118	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	902	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1119	}	903	}
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		904
1163	/******************************************************************************	905	/******************************************************************************
1164	*	906	*
1165	* Start of map related commands.	907	* Start of map related commands.
1166	*	908	*
…		…
1168		910
1169	/** Clears a map cell */	911	/** Clears a map cell */
1170	static void	912	static void
1171	map_clearcell (struct MapCell *cell, int count)	913	map_clearcell (struct MapCell *cell, int count)
1172	{	914	{
1173	cell->faces[0] = 0;	915	cell->faces[0] = 0;
1174	cell->faces[1] = 0;	916	cell->faces[1] = 0;
1175	cell->faces[2] = 0;	917	cell->faces[2] = 0;
		918	cell->smooth[0] = 0;
		919	cell->smooth[1] = 0;
		920	cell->smooth[2] = 0;
1176	cell->count = count;	921	cell->count = count;
1177	cell->stat_hp = 0;	922	cell->stat_hp = 0;
1178	cell->flags = 0;	923	cell->flags = 0;
1179	cell->player = 0;	924	cell->player = 0;
1180	}	925	}
1181		926
1182	#define MAX_LAYERS 3	927	#define MAX_LAYERS 3
1183		928
1184	/**	929	/**
…		…
1187	* it was.	932	* it was.
1188	* sl is the socklist this data is going into.	933	* sl is the socklist this data is going into.
1189	* ns is the socket we are working on - all the info we care	934	* ns is the socket we are working on - all the info we care
1190	* about is in this socket structure, so now need not pass the	935	* about is in this socket structure, so now need not pass the
1191	* entire player object.	936	* 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	937	* 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)	938	* 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	939	* take. Interesting to note that before this function, the map1 function
1198	* numbers the spaces differently - I think this was a leftover from	940	* 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	941	* 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	942	* the case, it seems to make more sense to have these layer values
1201	* actually match.	943	* actually match.
1202	*/	944	*/
1203	static int	945	static int
1204	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	946	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1205	{	947	{
1206	uint16 face_num;	948	object *ob = ms.faces_obj [layer];
1207	int bx, by, i;
1208
1209	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1210		949
1211	/* If there is no object for this space, or if the face for the object	950	/* If there is no object for this space, or if the face for the object
1212	* is the blank face, set the face number to zero.	951	* is the blank face, set the face number to zero.
1213	* else if we have the stored head object for this space, that takes	952	* else if we have the stored head object for this space, that takes
1214	* precedence over the other object for this space.	953	* precedence over the other object for this space.
1215	* otherwise, we do special head processing	954	* otherwise, we do special head processing
1216	*/	955	*/
1217	if (!ob || ob->face == blank_face)	956	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		957
1225	/* We've gotten what face we want to use for the object. Now see if	958	/* We've gotten what face we want to use for the object. Now see if
1226	* if it has changed since we last sent it to the client.	959	* if it has changed since we last sent it to the client.
1227	*/	960	*/
1228	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	961	if (lastcell.faces[layer] != face_num)
1229	{	962	{
1230	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	963	lastcell.faces[layer] = face_num;
		964
1231	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	965	if (!ns.faces_sent[face_num])
		966	if (ob)
		967	ns.send_faces (ob);
		968	else
1232	esrv_send_face (&ns, face_num, 0);	969	ns.send_face (face_num, 10);
1233		970
1234	sl << uint16 (face_num);	971	sl << uint16 (face_num);
1235	return 1;
1236	}
1237
1238	/* Nothing changed */
1239	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;	972	return 1;
1294	}	973	}
1295		974
1296	/* Nothing changed */	975	/* Nothing changed */
1297	return 0;	976	return 0;
…		…
1337	{	1016	{
1338	prefetch_surrounding_maps (op->map, 3);	1017	prefetch_surrounding_maps (op->map, 3);
1339	}	1018	}
1340		1019
1341	/**	1020	/**
1342	* This function uses the new map1 protocol command to send the map	1021	* 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	*/	1022	*/
1363	void	1023	void
1364	draw_client_map1 (object *pl)	1024	draw_client_map (player *pl)
1365	{	1025	{
		1026	object *ob = pl->observe;
		1027	if (!ob->active)
		1028	return;
		1029
		1030	maptile *plmap = ob->map;
		1031
		1032	/* If player is just joining the game, he isn't here yet, so the map
		1033	* can get swapped out. If so, don't try to send them a map. All will
		1034	* be OK once they really log in.
		1035	*/
		1036	if (!plmap || plmap->in_memory != MAP_ACTIVE)
		1037	return;
		1038
1366	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1039	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1367	sint16 nx, ny;
1368	int estartlen, eoldlen;	1040	int estartlen, eoldlen;
1369	uint16 mask, emask;
1370	uint8 eentrysize;	1041	uint8 eentrysize;
1371	uint16 ewhatstart, ewhatflag;	1042	uint16 ewhatstart, ewhatflag;
1372	uint8 extendedinfos;	1043	uint8 extendedinfos;
1373	maptile *m;
1374		1044
1375	client &socket = *pl->contr->ns;
1376
1377	if (!pl->active)
1378	return;
1379
1380	check_map_change (pl->contr);	1045	check_map_change (pl);
1381	prefetch_surrounding_maps (pl);	1046	prefetch_surrounding_maps (pl->ob);
		1047
		1048	/* do LOS after calls to update_position */
		1049	if (ob != pl->ob)
		1050	clear_los (pl);
		1051	else if (pl->do_los)
		1052	{
		1053	update_los (ob);
		1054	pl->do_los = 0;
		1055	}
		1056
		1057	/**
		1058	* This function uses the new map1 protocol command to send the map
		1059	* to the client. It is necessary because the old map command supports
		1060	* a maximum map size of 15x15.
		1061	* This function is much simpler than the old one. This is because
		1062	* the old function optimized to send as few face identifiers as possible,
		1063	* at the expense of sending more coordinate location (coordinates were
		1064	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		1065	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		1066	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		1067	* and use the other 4 bits for other informatiion. For full documentation
		1068	* of what we send, see the doc/Protocol file.
		1069	* I will describe internally what we do:
		1070	* the ns->lastmap shows how the map last looked when sent to the client.
		1071	* in the lastmap structure, there is a cells array, which is set to the
		1072	* maximum viewable size (As set in config.h).
		1073	* in the cells, there are faces and a count value.
		1074	* we use the count value to hold the darkness value. If -1, then this space
		1075	* is not viewable.
		1076	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1077	* look like.
		1078	*/
		1079
		1080	client &socket = *pl->ns;
1382		1081
1383	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1082	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1384	packet esl;	1083	packet esl;
1385		1084
1386	startlen = sl.length ();	1085	startlen = sl.length ();
…		…
1401	<< uint8 (extendedinfos)	1100	<< uint8 (extendedinfos)
1402	<< uint8 (eentrysize);	1101	<< uint8 (eentrysize);
1403		1102
1404	estartlen = esl.length ();	1103	estartlen = esl.length ();
1405	}	1104	}
1406	else
1407	{
1408	/* suppress compiler warnings */
1409	ewhatstart = 0;
1410	ewhatflag = 0;
1411	estartlen = 0;
1412	}
1413		1105
1414	/* x,y are the real map locations. ax, ay are viewport relative	1106	/* x,y are the real map locations. ax, ay are viewport relative
1415	* locations.	1107	* locations.
1416	*/	1108	*/
1417	ay = 0;	1109	ay = 0;
1418		1110
1419	/* We could do this logic as conditionals in the if statement,	1111	/* We could do this logic as conditionals in the if statement,
1420	* but that started to get a bit messy to look at.	1112	* but that started to get a bit messy to look at.
1421	*/	1113	*/
1422	max_x = pl->x + (socket.mapx + 1) / 2;	1114	max_x = ob->x + (socket.mapx + 1) / 2;
1423	max_y = pl->y + (socket.mapy + 1) / 2;	1115	max_y = ob->y + (socket.mapy + 1) / 2;
1424		1116
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++)	1117	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1432	{	1118	{
		1119	sint16 nx, ny;
		1120	maptile *m = 0;
		1121
1433	ax = 0;	1122	ax = 0;
1434	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1123	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1435	{	1124	{
		1125	// check to see if we can simply go one right quickly
		1126	++nx;
		1127	if (m && nx >= m->width)
		1128	m = 0;
		1129
		1130	if (!m)
		1131	{
		1132	nx = x; ny = y; m = plmap;
		1133
		1134	if (xy_normalise (m, nx, ny))
		1135	m->touch ();
		1136	else
		1137	m = 0;
		1138	}
		1139
		1140	int emask, mask;
1436	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1141	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1437		1142
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];	1143	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1479
1480	d = pl->contr->blocked_los[ax][ay];
1481		1144
1482	/* If the coordinates are not valid, or it is too dark to see,	1145	/* If the coordinates are not valid, or it is too dark to see,
1483	* we tell the client as such	1146	* we tell the client as such
1484	*/	1147	*/
1485	nx = x;
1486	ny = y;
1487	m = get_map_from_coord (pl->map, &nx, &ny);
1488
1489	if (!m)	1148	if (!m)
1490	{	1149	{
1491	/* space is out of map. Update space and clear values	1150	/* space is out of map. Update space and clear values
1492	* if this hasn't already been done. If the space is out	1151	* if this hasn't already been done. If the space is out
1493	* of the map, it shouldn't have a head	1152	* of the map, it shouldn't have a head
…		…
1495	if (lastcell.count != -1)	1154	if (lastcell.count != -1)
1496	{	1155	{
1497	sl << uint16 (mask);	1156	sl << uint16 (mask);
1498	map_clearcell (&lastcell, -1);	1157	map_clearcell (&lastcell, -1);
1499	}	1158	}
		1159
		1160	continue;
1500	}	1161	}
		1162
		1163	int d = pl->blocked_los[ax][ay];
		1164
1501	else if (d > 3)	1165	if (d > 3)
1502	{	1166	{
1503	m->touch ();
1504		1167
1505	int need_send = 0, count;	1168	int need_send = 0, count;
1506		1169
1507	/* This block deals with spaces that are not visible for whatever	1170	/* This block deals with spaces that are not visible for whatever
1508	* reason. Still may need to send the head for this space.	1171	* reason. Still may need to send the head for this space.
1509	*/	1172	*/
1510		1173
1511	oldlen = sl.length ();	1174	oldlen = sl.length ();
1512		1175
1513	sl << uint16 (mask);	1176	sl << uint16 (mask);
…		…
1516	need_send = 1;	1179	need_send = 1;
1517		1180
1518	count = -1;	1181	count = -1;
1519		1182
1520	/* properly clear a previously sent big face */	1183	/* properly clear a previously sent big face */
1521	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1184	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1522	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1185	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1523	need_send = 1;	1186	need_send = 1;
1524		1187
1525	map_clearcell (&lastcell, count);	1188	map_clearcell (&lastcell, count);
1526		1189
…		…
1529	else	1192	else
1530	sl.reset (oldlen);	1193	sl.reset (oldlen);
1531	}	1194	}
1532	else	1195	else
1533	{	1196	{
1534	m->touch ();
1535
1536	/* In this block, the space is visible or there are head objects	1197	/* In this block, the space is visible.
1537	* we need to send.
1538	*/	1198	*/
1539		1199
1540	/* Rather than try to figure out what everything that we might	1200	/* Rather than try to figure out what everything that we might
1541	* need to send is, then form the packet after that,	1201	* need to send is, then form the packet after that,
1542	* we presume that we will in fact form a packet, and update	1202	* we presume that we will in fact form a packet, and update
…		…
1545	* is done.	1205	* is done.
1546	* I think this is simpler than doing a bunch of checks to see	1206	* I think this is simpler than doing a bunch of checks to see
1547	* what if anything we need to send, setting the bits, then	1207	* what if anything we need to send, setting the bits, then
1548	* doing those checks again to add the real data.	1208	* doing those checks again to add the real data.
1549	*/	1209	*/
1550	oldlen = sl.length ();	1210	oldlen = sl.length ();
1551	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1552	eoldlen = esl.length ();	1211	eoldlen = esl.length ();
1553	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1212
1554	sl << uint16 (mask);	1213	sl << uint16 (mask);
1555
1556	if (socket.ext_mapinfos)
1557	esl << uint16 (emask);
1558		1214
1559	unsigned char dummy;	1215	unsigned char dummy;
1560	unsigned char *last_ext = &dummy;	1216	unsigned char *last_ext = &dummy;
1561		1217
1562	/* Darkness changed */	1218	/* Darkness changed */
…		…
1574	sl << uint8 (255 - 64 * d);	1230	sl << uint8 (255 - 64 * d);
1575	}	1231	}
1576		1232
1577	lastcell.count = d;	1233	lastcell.count = d;
1578		1234
		1235	mapspace &ms = m->at (nx, ny);
		1236	ms.update ();
		1237
1579	if (socket.extmap)	1238	if (socket.extmap)
1580	{	1239	{
1581	uint8 stat_hp = 0;	1240	uint8 stat_hp = 0;
1582	uint8 stat_width = 0;	1241	uint8 stat_width = 0;
1583	uint8 flags = 0;	1242	uint8 flags = 0;
1584	UUID player = 0;	1243	tag_t player = 0;
1585		1244
1586	// send hp information, if applicable	1245	// send hp information, if applicable
1587	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1246	if (object *op = ms.faces_obj [0])
		1247	if (op->is_head () && !op->invisible)
1588	{	1248	{
1589	if (op->head || op->invisible)	1249	if (op->stats.maxhp > op->stats.hp
1590	; // do not show	1250	&& op->stats.maxhp > 0
1591	else if (op->type == PLAYER	1251	&& (op->type == PLAYER
		1252	|| op->type == DOOR // does not work, have maxhp 0
1592	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1253	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1593	{
1594	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1595	{	1254	{
1596	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1255	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1597	stat_width = op->arch->tail_x;	1256	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1598	}	1257	}
1599	}
1600		1258
1601	if (op->msg && op->msg[0] == '@')	1259	if (op->msg && op->msg[0] == '@')
1602	flags |= 1;	1260	flags |= 1;
1603		1261
1604	if (op->type == PLAYER && op != pl)	1262	if (op->type == PLAYER && op != ob)
1605	player = op->count;	1263	player = op->count;
1606	}	1264	}
1607		1265
1608	if (lastcell.stat_hp != stat_hp)	1266	if (lastcell.stat_hp != stat_hp)
1609	{	1267	{
1610	lastcell.stat_hp = stat_hp;	1268	lastcell.stat_hp = stat_hp;
1611		1269
…		…
1630		1288
1631	mask |= 0x8;	1289	mask |= 0x8;
1632	*last_ext |= 0x80;	1290	*last_ext |= 0x80;
1633	last_ext = &sl[sl.length ()];	1291	last_ext = &sl[sl.length ()];
1634		1292
1635	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1293	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1636	}	1294	}
1637		1295
1638	if (lastcell.flags != flags)	1296	if (lastcell.flags != flags)
1639	{	1297	{
1640	lastcell.flags = flags;	1298	lastcell.flags = flags;
…		…
1646	sl << uint8 (8) << uint8 (flags);	1304	sl << uint8 (8) << uint8 (flags);
1647	}	1305	}
1648	}	1306	}
1649		1307
1650	/* Floor face */	1308	/* Floor face */
1651	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1309	if (update_space (sl, socket, ms, lastcell, 2))
1652	mask |= 0x4;	1310	mask |= 0x4;
1653		1311
1654	if (socket.EMI_smooth)
1655	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1656	emask |= 0x4;
1657
1658	/* Middle face */	1312	/* Middle face */
1659	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1313	if (update_space (sl, socket, ms, lastcell, 1))
1660	mask |= 0x2;	1314	mask |= 0x2;
1661		1315
1662	if (socket.EMI_smooth)	1316	if (ms.player () == ob
1663	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1317	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1664	emask |= 0x2;
1665
1666	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1667	{	1318	{
		1319	// force player to be visible to himself if invisible
1668	if (lastcell.faces[0] != pl->face)	1320	if (lastcell.faces[0] != ob->face)
1669	{	1321	{
1670	lastcell.faces[0] = pl->face;	1322	lastcell.faces[0] = ob->face;
		1323
1671	mask |= 0x1;	1324	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);	1325	sl << uint16 (ob->face);
		1326
		1327	socket.send_faces (ob);
1677	}	1328	}
1678	}	1329	}
1679	else
1680	{
1681	/* Top face */	1330	/* Top face */
1682	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1331	else if (update_space (sl, socket, ms, lastcell, 0))
1683	mask |= 0x1;	1332	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		1333
1690	/* Check to see if we are in fact sending anything for this	1334	/* Check to see if we are in fact sending anything for this
1691	* space by checking the mask. If so, update the mask.	1335	* space by checking the mask. If so, update the mask.
1692	* if not, reset the len to that from before adding the mask	1336	* if not, reset the len to that from before adding the mask
1693	* value, so we don't send those bits.	1337	* value, so we don't send those bits.
…		…
1695	if (mask & 0xf)	1339	if (mask & 0xf)
1696	sl[oldlen + 1] = mask & 0xff;	1340	sl[oldlen + 1] = mask & 0xff;
1697	else	1341	else
1698	sl.reset (oldlen);	1342	sl.reset (oldlen);
1699		1343
		1344	if (socket.ext_mapinfos)
		1345	esl << uint16 (emask);
		1346
		1347	if (socket.EMI_smooth)
		1348	{
		1349	for (int layer = 2+1; layer--; )
		1350	{
		1351	object *ob = ms.faces_obj [layer];
		1352
		1353	// If there is no object for this space, or if the face for the object
		1354	// is the blank face, set the smoothlevel to zero.
		1355	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1356
		1357	// We've gotten what face we want to use for the object. Now see if
		1358	// if it has changed since we last sent it to the client.
		1359	if (lastcell.smooth[layer] != smoothlevel)
		1360	{
		1361	lastcell.smooth[layer] = smoothlevel;
		1362	esl << uint8 (smoothlevel);
		1363	emask |= 1 << layer;
		1364	}
		1365	}
		1366
1700	if (emask & 0xf)	1367	if (emask & 0xf)
1701	esl[eoldlen + 1] = emask & 0xff;	1368	esl[eoldlen + 1] = emask & 0xff;
1702	else	1369	else
1703	esl.reset (eoldlen);	1370	esl.reset (eoldlen);
		1371	}
1704	} /* else this is a viewable space */	1372	} /* else this is a viewable space */
1705	} /* for x loop */	1373	} /* for x loop */
1706	} /* for y loop */	1374	} /* for y loop */
		1375
		1376	socket.flush_fx ();
1707		1377
1708	/* Verify that we in fact do need to send this */	1378	/* Verify that we in fact do need to send this */
1709	if (socket.ext_mapinfos)	1379	if (socket.ext_mapinfos)
1710	{	1380	{
1711	if (!(sl.length () > startlen || socket.sent_scroll))	1381	if (!(sl.length () > startlen || socket.sent_scroll))
1712	{	1382	{
1713	/* No map data will follow, so don't say the client	1383	/* No map data will follow, so don't say the client
1714	* it doesn't need draw!	1384	* it doesn't need draw!
1715	*/	1385	*/
1716	ewhatflag &= (~EMI_NOREDRAW);	1386	ewhatflag &= ~EMI_NOREDRAW;
1717	esl[ewhatstart + 1] = ewhatflag & 0xff;	1387	esl[ewhatstart + 1] = ewhatflag & 0xff;
1718	}	1388	}
1719		1389
1720	if (esl.length () > estartlen)	1390	if (esl.length () > estartlen)
1721	socket.send_packet (esl);	1391	socket.send_packet (esl);
…		…
1726	socket.send_packet (sl);	1396	socket.send_packet (sl);
1727	socket.sent_scroll = 0;	1397	socket.sent_scroll = 0;
1728	}	1398	}
1729	}	1399	}
1730		1400
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
1751	/* 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
1753	* be OK once they really log in.
1754	*/
1755	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1756	return;
1757
1758	memset (&newmap, 0, sizeof (struct Map));
1759
1760	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1761	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1762	{
1763	ax = i;
1764	ay = j;
1765	m = pm;
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	*/
1775	if (mflags & P_NEW_MAP)
1776	m->timeout = 50;
1777	}
1778
1779	/* do LOS after calls to update_position */
1780	if (pl->contr->do_los)
1781	{
1782	update_los (pl);
1783	pl->contr->do_los = 0;
1784	}
1785
1786	/* Big maps need a different drawing mechanism to work */
1787	draw_client_map1 (pl);
1788	}
1789
1790
1791	/*****************************************************************************/	1401	/*****************************************************************************/
1792
1793	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1402	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1794
1795	/* a player. Of course, the client need to know the command to be able to */	1403	/* a player. Of course, the client need to know the command to be able to */
1796
1797	/* manage it ! */	1404	/* manage it ! */
1798
1799	/*****************************************************************************/	1405	/*****************************************************************************/
1800	void	1406	void
1801	send_plugin_custom_message (object *pl, char *buf)	1407	send_plugin_custom_message (object *pl, char *buf)
1802	{	1408	{
1803	pl->contr->ns->send_packet (buf);	1409	pl->contr->ns->send_packet (buf);
…		…
1814	sl << "replyinfo skill_info\n";	1420	sl << "replyinfo skill_info\n";
1815		1421
1816	for (int i = 1; i < NUM_SKILLS; i++)	1422	for (int i = 1; i < NUM_SKILLS; i++)
1817	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1423	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1818		1424
1819	if (sl.length () >= MAXSOCKBUF)	1425	if (sl.length () > MAXSOCKBUF)
1820	{	1426	{
1821	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1427	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1822	fatal (0);	1428	fatal (0);
1823	}	1429	}
1824		1430
…		…
1837	sl << "replyinfo spell_paths\n";	1443	sl << "replyinfo spell_paths\n";
1838		1444
1839	for (int i = 0; i < NRSPELLPATHS; i++)	1445	for (int i = 0; i < NRSPELLPATHS; i++)
1840	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1446	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1841		1447
1842	if (sl.length () >= MAXSOCKBUF)	1448	if (sl.length () > MAXSOCKBUF)
1843	{	1449	{
1844	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1450	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1845	fatal (0);	1451	fatal (0);
1846	}	1452	}
1847		1453
…		…
1955	if (!spell->face)	1561	if (!spell->face)
1956	{	1562	{
1957	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1563	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1958	spell->face = face_find ("burnout.x11", blank_face);	1564	spell->face = face_find ("burnout.x11", blank_face);
1959	}	1565	}
		1566
		1567	pl->ns->send_face (spell->face);
1960		1568
1961	/* send the current values */	1569	/* send the current values */
1962	sl << uint32 (spell->count)	1570	sl << uint32 (spell->count)
1963	<< uint16 (spell->level)	1571	<< uint16 (spell->level)
1964	<< uint16 (spell->casting_time)	1572	<< uint16 (spell->casting_time)
…		…
2000	* bytes and 3 strings (because that is the spec) so we need to	1608	* bytes and 3 strings (because that is the spec) so we need to
2001	* check that the length of those 3 strings, plus the 23 bytes,	1609	* check that the length of those 3 strings, plus the 23 bytes,
2002	* won't take us over the length limit for the socket, if it does,	1610	* won't take us over the length limit for the socket, if it does,
2003	* we need to send what we already have, and restart packet formation	1611	* we need to send what we already have, and restart packet formation
2004	*/	1612	*/
		1613	if (spell->type != SPELL)
		1614	continue;
		1615
2005	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1616	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
2006	* to show add_spell is 26 bytes + 2 strings. However, the overun	1617	* to show add_spell is 26 bytes + 2 strings. However, the overun
2007	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1618	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2008	* like it will fix this	1619	* like it will fix this
2009	*/	1620	*/
2010	if (spell->type != SPELL)
2011	continue;
2012
2013	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1621	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2014	{	1622	{
		1623	pl->ns->flush_fx ();
2015	pl->ns->send_packet (sl);	1624	pl->ns->send_packet (sl);
2016		1625
2017	sl.reset ();	1626	sl.reset ();
2018	sl << "addspell ";	1627	sl << "addspell ";
2019	}	1628	}
…		…
2027	return;	1636	return;
2028	}	1637	}
2029	else	1638	else
2030	append_spell (pl, sl, spell);	1639	append_spell (pl, sl, spell);
2031		1640
2032	if (sl.length () >= MAXSOCKBUF)	1641	if (sl.length () > MAXSOCKBUF)
2033	{	1642	{
2034	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1643	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2035	fatal (0);	1644	fatal (0);
2036	}	1645	}
2037		1646
2038	/* finally, we can send the packet */	1647	/* finally, we can send the packet */
		1648	pl->ns->flush_fx ();
2039	pl->ns->send_packet (sl);	1649	pl->ns->send_packet (sl);
2040	}	1650	}
2041		1651

Diff Legend

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