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.71 by root, Mon Mar 12 01:13:10 2007 UTC vs.
Revision 1.132 by elmex, Sun Jun 15 19:34:31 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.
…		…
130	}	129	}
131		130
132	static void	131	static void
133	clear_map (player *pl)	132	clear_map (player *pl)
134	{	133	{
		134	pl->ns->mapinfo_queue_clear ();
		135
135	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;
136		139
137	if (pl->ns->newmapcmd == 1)	140	if (pl->ns->newmapcmd == 1)
138	pl->ns->send_packet ("newmap");	141	pl->ns->send_packet ("newmap");
139		142
140	pl->ns->floorbox_reset ();	143	pl->ns->floorbox_reset ();
		144	}
		145
		146	static void
		147	send_map_info (player *pl)
		148	{
		149	client &socket = *pl->ns;
		150	object *ob = pl->observe;
		151
		152	if (socket.mapinfocmd)
		153	{
		154	if (ob->map && ob->map->path[0])
		155	{
		156	int flags = 0;
		157
		158	if (ob->map->tile_path[0]) flags |= 1;
		159	if (ob->map->tile_path[1]) flags |= 2;
		160	if (ob->map->tile_path[2]) flags |= 4;
		161	if (ob->map->tile_path[3]) flags |= 8;
		162
		163	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		164	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		165	ob->map->width, ob->map->height, &ob->map->path);
		166	}
		167	else
		168	socket.send_packet ("mapinfo current");
		169	}
141	}	170	}
142		171
143	/** check for map/region change and send new map data */	172	/** check for map/region change and send new map data */
144	static void	173	static void
145	check_map_change (player *pl)	174	check_map_change (player *pl)
146	{	175	{
147	client &socket = *pl->ns;	176	client &socket = *pl->ns;
148	object *ob = pl->ob;	177	object *ob = pl->observe;
149	char buf[MAX_BUF]; /* eauugggh */
150		178
151	if (socket.current_map != ob->map)	179	region *reg = ob->region ();
		180	if (socket.current_region != reg)
		181	{
		182	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		183	socket.current_region = reg;
152	{	184	}
		185
		186	// first try to aovid a full newmap on tiled map scrolls
		187	if (socket.current_map != ob->map && !socket.force_newmap)
		188	{
		189	rv_vector rv;
		190
		191	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		192
		193	// manhattan distance is very handy here
		194	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		195	{
		196	socket.current_map = ob->map;
		197	socket.current_x = ob->x;
		198	socket.current_y = ob->y;
		199
		200	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		201	socket.floorbox_reset ();
		202	send_map_info (pl);
		203	}
		204	}
		205
		206	if (socket.current_map != ob->map || socket.force_newmap)
		207	{
		208	clear_map (pl);
153	socket.current_map = ob->map;	209	socket.current_map = ob->map;
154		210	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	}	211	}
181	else if (socket.current_x != ob->x || socket.current_y != ob->y)	212	else if (socket.current_x != ob->x || socket.current_y != ob->y)
182	{	213	{
183	int dx = ob->x - socket.current_x;	214	int dx = ob->x - socket.current_x;
184	int dy = ob->y - socket.current_y;	215	int dy = ob->y - socket.current_y;
…		…
192	}	223	}
193	}	224	}
194		225
195	socket.current_x = ob->x;	226	socket.current_x = ob->x;
196	socket.current_y = ob->y;	227	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	}	228	}
205		229
206	/**	230	/**
207	* RequestInfo is sort of a meta command. There is some specific	231	* RequestInfo is sort of a meta command. There is some specific
208	* request of information, but we call other functions to provide	232	* request of information, but we call other functions to provide
209	* that information.	233	* that information.
210	*/	234	*/
211	void	235	void
212	RequestInfo (char *buf, int len, client * ns)	236	RequestInfo (char *buf, int len, client *ns)
213	{	237	{
214	char *params = NULL, *cp;	238	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		239
227	/* find the first space, make it null, and update the	240	/* find the first space, make it null, and update the
228	* params pointer.	241	* params pointer.
229	*/	242	*/
230	for (cp = buf; *cp != '\0'; cp++)	243	for (params = buf; *params; params++)
231	if (*cp == ' ')	244	if (*params == ' ')
232	{	245	{
233	*cp = '\0';
234	params = cp + 1;	246	*params++ = 0;
235	break;	247	break;
236	}	248	}
237		249
238	if (!strcmp (buf, "image_info"))	250	if (!strcmp (buf, "image_info"))
239	send_image_info (ns, params);	251	send_image_info (ns, params);
…		…
242	else if (!strcmp (buf, "skill_info"))	254	else if (!strcmp (buf, "skill_info"))
243	send_skill_info (ns, params);	255	send_skill_info (ns, params);
244	else if (!strcmp (buf, "spell_paths"))	256	else if (!strcmp (buf, "spell_paths"))
245	send_spell_paths (ns, params);	257	send_spell_paths (ns, params);
246	else	258	else
247	ns->send_packet (bigbuf, len);	259	{
		260	// undo tokenisation above and send replyinfo with the request unchanged
		261	if (*params)
		262	*--params = ' ';
		263
		264	ns->send_packet_printf ("replyinfo %s", buf);
		265	}
248	}	266	}
249		267
250	void	268	void
251	ExtCmd (char *buf, int len, player *pl)	269	ExtCmd (char *buf, int len, player *pl)
252	{	270	{
…		…
255		273
256	void	274	void
257	ExtiCmd (char *buf, int len, client *ns)	275	ExtiCmd (char *buf, int len, client *ns)
258	{	276	{
259	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	277	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		278	}
		279
		280	void
		281	client::mapinfo_queue_clear ()
		282	{
		283	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		284	free (*i);
		285
		286	mapinfo_queue.clear ();
		287	}
		288
		289	bool
		290	client::mapinfo_try (char *buf)
		291	{
		292	char *token = buf;
		293	buf += strlen (buf) + 9;
		294
		295	// initial map and its origin
		296	maptile *map = pl->observe->map;
		297	int mapx = pl->ns->mapx / 2 - pl->observe->x;
		298	int mapy = pl->ns->mapy / 2 - pl->observe->y;
		299	int max_distance = 8; // limit maximum path length to something generous
		300
		301	while (*buf && map && max_distance)
		302	{
		303	int dir = *buf++ - '1';
		304
		305	if (dir >= 0 && dir <= 3)
		306	{
		307	if (!map->tile_path [dir])
		308	map = 0;
		309	else if (map->tile_available (dir, false))
		310	{
		311	maptile *neigh = map->tile_map [dir];
		312
		313	switch (dir)
		314	{
		315	case 0: mapy -= neigh->height; break;
		316	case 2: mapy += map ->height; break;
		317	case 3: mapx -= neigh->width ; break;
		318	case 1: mapx += map ->width ; break;
		319	}
		320
		321	map = neigh;
		322	--max_distance;
		323	}
		324	else
		325	return 0;
		326	}
		327	else
		328	max_distance = 0;
		329	}
		330
		331	if (!max_distance)
		332	send_packet_printf ("mapinfo %s error", token);
		333	else if (!map || !map->path)
		334	send_packet_printf ("mapinfo %s nomap", token);
		335	else
		336	{
		337	int flags = 0;
		338
		339	if (map->tile_path[0]) flags |= 1;
		340	if (map->tile_path[1]) flags |= 2;
		341	if (map->tile_path[2]) flags |= 4;
		342	if (map->tile_path[3]) flags |= 8;
		343
		344	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		345	}
		346
		347	return 1;
		348	}
		349
		350	void
		351	client::mapinfo_queue_run ()
		352	{
		353	if (mapinfo_queue.empty () || !pl)
		354	return;
		355
		356	for (int i = 0; i < mapinfo_queue.size (); ++i)
		357	if (mapinfo_try (mapinfo_queue [i]))
		358	{
		359	free (mapinfo_queue [i]);
		360	mapinfo_queue.erase (i);
		361	}
		362	else
		363	++i;
260	}	364	}
261		365
262	void	366	void
263	MapInfoCmd (char *buf, int len, player *pl)	367	MapInfoCmd (char *buf, int len, player *pl)
264	{	368	{
265	// <mapinfo tag spatial tile-path	369	// <mapinfo tag spatial tile-path
266	// >mapinfo tag spatial flags x y w h hash	370	// >mapinfo tag spatial flags x y w h hash
267		371
268	char bigbuf[MAX_BUF], *token;
269
270	token = buf;	372	char *token = buf;
271	// copy token	373
272	if (!(buf = strchr (buf, ' ')))	374	if (!(buf = strchr (buf, ' ')))
273	return;	375	return;
274		376
275	*buf++ = 0;
276
277	if (!strncmp (buf, "spatial ", 8))	377	if (!strncmp (buf, " spatial ", 9))
278	{	378	{
279	buf += 8;	379	char *copy = strdup (token);
		380	copy [buf - token] = 0;
280		381
281	// initial map and its origin	382	#if 0
282	maptile *map = pl->ob->map;	383	// this makes only sense when we flush the buffer immediately
283	sint16 dx, dy;	384	if (pl->ns->mapinfo_try (copy))
284	int mapx = pl->ns->mapx / 2 - pl->ob->x;	385	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	386	else
341	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	387	#endif
		388	pl->ns->mapinfo_queue.push_back (copy);
342	}	389	}
343	else	390	else
344	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	391	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346	pl->ns->send_packet (bigbuf);
347	}	392	}
348		393
349	/** This is the Setup cmd - easy first implementation */	394	/** This is the Setup cmd */
350	void	395	void
351	SetUp (char *buf, int len, client * ns)	396	SetUp (char *buf, int len, client * ns)
352	{	397	{
353	int s, slen;	398	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	}	399	}
558		400
559	/**	401	/**
560	* The client has requested to be added to the game.	402	* 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.	403	* 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,	404	* 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.	405	* it either has to be here or init_sockets needs to be exported.
564	*/	406	*/
565	void	407	void
566	AddMeCmd (char *buf, int len, client * ns)	408	AddMeCmd (char *buf, int len, client *ns)
567	{	409	{
568	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569	}	411	}
570		412
571	/** Reply to ExtendedInfos command */	413	/** Reply to ExtendedInfos command */
…		…
683		525
684	ns->send_packet (cmdback);	526	ns->send_packet (cmdback);
685	}	527	}
686		528
687	/**	529	/**
688	* A lot like the old AskSmooth (in fact, now called by AskSmooth).
689	* Basically, it makes no sense to wait for the client to request a
690	* a piece of data from us that we know the client wants. So
691	* if we know the client wants it, might as well push it to the
692	* client.
693	*/
694	static void
695	SendSmooth (client *ns, uint16 face)
696	{
697	uint16 smoothface;
698
699	/* If we can't find a face, return and set it so we won't try to send this
700	* again.
701	*/
702	if (!FindSmooth (face, &smoothface))
703	{
704
705	LOG (llevError, "could not findsmooth for %d.\n", face);
706	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
707	return;
708	}
709
710	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
711	esrv_send_face (ns, smoothface, 0);
712
713	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
714
715	packet sl ("smooth");
716
717	sl << uint16 (face)
718	<< uint16 (smoothface);
719
720	ns->send_packet (sl);
721	}
722
723	/**
724	* Tells client the picture it has to use
725	* to smooth a picture number given as argument.
726	*/
727	void
728	AskSmooth (char *buf, int len, client *ns)
729	{
730	SendSmooth (ns, atoi (buf));
731	}
732
733	/**
734	* This handles the general commands from the client (ie, north, fire, cast,	530	* This handles the general commands from the client (ie, north, fire, cast,
735	* etc.)	531	* etc.)
736	*/	532	*/
737	void	533	void
738	PlayerCmd (char *buf, int len, player *pl)	534	PlayerCmd (char *buf, int len, player *pl)
…		…
759	* commands.	555	* commands.
760	*/	556	*/
761	pl->count = 0;	557	pl->count = 0;
762	}	558	}
763		559
764
765	/**	560	/**
766	* This handles the general commands from the client (ie, north, fire, cast,	561	* This handles the general commands from the client (ie, north, fire, cast,
767	* etc.). It is a lot like PlayerCmd above, but is called with the	562	* etc.). It is a lot like PlayerCmd above, but is called with the
768	* 'ncom' method which gives more information back to the client so it	563	* 'ncom' method which gives more information back to the client so it
769	* can throttle.	564	* can throttle.
…		…
771	void	566	void
772	NewPlayerCmd (char *buf, int len, player *pl)	567	NewPlayerCmd (char *buf, int len, player *pl)
773	{	568	{
774	if (len <= 6)	569	if (len <= 6)
775	{	570	{
776	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	571	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
777	return;	572	return;
778	}	573	}
779		574
780	uint16 cmdid = net_uint16 ((uint8 *)buf);	575	uint16 cmdid = net_uint16 ((uint8 *)buf);
781	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	576	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
838	{	633	{
839	case ST_PLAYING:	634	case ST_PLAYING:
840	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	635	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
841	break;	636	break;
842		637
843	case ST_CHANGE_CLASS:
844	key_change_class (pl->ob, buf[0]);
845	break;
846
847	case ST_GET_PARTY_PASSWORD: /* Get password for party */	638	case ST_GET_PARTY_PASSWORD: /* Get password for party */
848	receive_party_password (pl->ob, 13);	639	receive_party_password (pl->ob, 13);
849	break;	640	break;
850		641
851	default:	642	default:
…		…
890		681
891	cp = strchr (cp + 1, ' ');	682	cp = strchr (cp + 1, ' ');
892		683
893	if (cp)	684	if (cp)
894	{	685	{
895	assign (ns->version, cp + 1);	686	ns->version = cp + 1;
896		687
897	if (ns->sc_version < 1026)	688	if (ns->sc_version < 1026)
898	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	689	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
899	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	690	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
900	}	691	}
…		…
923	* syntax is: move (to) (tag) (nrof)	714	* syntax is: move (to) (tag) (nrof)
924	*/	715	*/
925	void	716	void
926	MoveCmd (char *buf, int len, player *pl)	717	MoveCmd (char *buf, int len, player *pl)
927	{	718	{
928	int vals[3], i;	719	int to, tag, nrof;
929		720
930	/* A little funky here. We only cycle for 2 records, because	721	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
931	* we obviously are not going to find a space after the third
932	* record. Perhaps we should just replace this with a
933	* sscanf?
934	*/
935	for (i = 0; i < 2; i++)
936	{	722	{
937	vals[i] = atoi (buf);
938
939	if (!(buf = strchr (buf, ' ')))
940	{
941	LOG (llevError, "Incomplete move command: %s\n", buf);	723	LOG (llevError, "Incomplete move command: %s\n", buf);
942	return;	724	return;
943	}
944
945	buf++;
946	}	725	}
947		726
948	vals[2] = atoi (buf);	727	esrv_move_object (pl->ob, to, tag, nrof);
949
950	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
951	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
952	}	728	}
953		729
954	/******************************************************************************	730	/******************************************************************************
955	*	731	*
956	* Start of commands the server sends to the client.	732	* Start of commands the server sends to the client.
…		…
960	/**	736	/**
961	* Asks the client to query the user. This way, the client knows	737	* Asks the client to query the user. This way, the client knows
962	* it needs to send something back (vs just printing out a message)	738	* it needs to send something back (vs just printing out a message)
963	*/	739	*/
964	void	740	void
965	send_query (client *ns, uint8 flags, char *text)	741	send_query (client *ns, uint8 flags, const char *text)
966	{	742	{
967	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	743	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
		744	}
		745
		746	/**
		747	* Get player's current range attack in obuf.
		748	*/
		749	static void
		750	rangetostring (player *pl, char *obuf)
		751	{
		752	dynbuf_text buf;
		753
		754	if (pl->ranged_ob)
		755	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		756
		757	if (pl->combat_ob)
		758	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		759
		760	#if 0
		761	//TODO: remove this when slot system is working, this is only for debugging
		762	if (pl->ob->chosen_skill)
		763	buf << " Skill*: " << pl->ob->chosen_skill->name;
		764	#endif
		765
		766	//TODO: maybe golem should become the current_weapon, quite simply?
		767	if (pl->golem)
		768	buf << " Golem*: " << pl->golem->name;
		769
		770	buf << '\0';
		771	buf.linearise (obuf);
968	}	772	}
969		773
970	#define AddIfInt64(Old,New,Type) if (Old != New) {\	774	#define AddIfInt64(Old,New,Type) if (Old != New) {\
971	Old = New; \	775	Old = New; \
972	sl << uint8 (Type) << uint64 (New); \	776	sl << uint8 (Type) << uint64 (New); \
…		…
980	#define AddIfShort(Old,New,Type) if (Old != New) {\	784	#define AddIfShort(Old,New,Type) if (Old != New) {\
981	Old = New; \	785	Old = New; \
982	sl << uint8 (Type) << uint16 (New); \	786	sl << uint8 (Type) << uint16 (New); \
983	}	787	}
984		788
985	#define AddIfFloat(Old,New,Type) if (Old != New) {\	789	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
986	Old = New; \	790	Old = New; \
987	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	791	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
988	}	792	}
989		793
990	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	794	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
991	free(Old); Old = strdup (New);\	795	free(Old); Old = strdup (New);\
992	sl << uint8 (Type) << data8 (New); \	796	sl << uint8 (Type) << data8 (New); \
…		…
1006		810
1007	client *ns = pl->ns;	811	client *ns = pl->ns;
1008	if (!ns)	812	if (!ns)
1009	return;	813	return;
1010		814
1011	object *ob = pl->ob;	815	object *ob = pl->observe;
1012	if (!ob)	816	if (!ob)
1013	return;	817	return;
		818
		819	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1014		820
1015	packet sl ("stats");	821	packet sl ("stats");
1016		822
1017	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	823	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1018	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	824	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
1027	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	833	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1028	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	834	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1029	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	835	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1030		836
1031	for (int s = 0; s < NUM_SKILLS; s++)	837	for (int s = 0; s < NUM_SKILLS; s++)
1032	if (object *skill = pl->last_skill_ob[s])	838	if (object *skill = opl->last_skill_ob[s])
1033	if (skill->stats.exp != ns->last_skill_exp [s])	839	if (skill->stats.exp != ns->last_skill_exp [s])
1034	{	840	{
1035	ns->last_skill_exp [s] = skill->stats.exp;	841	ns->last_skill_exp [s] = skill->stats.exp;
1036		842
1037	/* Always send along the level if exp changes. This is only	843	/* Always send along the level if exp changes. This is only
…		…
1045	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	851	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1046	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	852	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1047	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	853	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1048	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	854	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1049	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	855	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1050	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	856	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1051	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	857	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1052	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	858	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1053	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	859	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1054		860
1055	flags = 0;	861	flags = 0;
1056		862
1057	if (pl->fire_on)	863	if (opl->fire_on)
1058	flags |= SF_FIREON;	864	flags |= SF_FIREON;
1059		865
1060	if (pl->run_on)	866	if (opl->run_on)
1061	flags |= SF_RUNON;	867	flags |= SF_RUNON;
1062		868
1063	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	869	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1064		870
1065	if (ns->sc_version < 1025)	871	if (ns->sc_version < 1025)
…		…
1079	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	885	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1080	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	886	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1081	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	887	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1082	}	888	}
1083		889
1084	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	890	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1085	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	891	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1086	set_title (ob, buf);	892	set_title (ob, buf);
1087	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	893	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1088		894
1089	/* Only send it away if we have some actual data */	895	/* Only send it away if we have some actual data */
…		…
1093		899
1094	/**	900	/**
1095	* Tells the client that here is a player it should start using.	901	* Tells the client that here is a player it should start using.
1096	*/	902	*/
1097	void	903	void
1098	esrv_new_player (player *pl, uint32 weight)	904	esrv_new_player (player *pl)
1099	{	905	{
		906	sint32 weight = pl->ob->client_weight ();
		907
1100	packet sl ("player");	908	packet sl ("player");
1101		909
1102	sl << uint32 (pl->ob->count)	910	sl << uint32 (pl->ob->count)
1103	<< uint32 (weight)	911	<< uint32 (weight)
1104	<< uint32 (pl->ob->face)	912	<< uint32 (pl->ob->face)
…		…
1106		914
1107	pl->ns->last_weight = weight;	915	pl->ns->last_weight = weight;
1108	pl->ns->send_packet (sl);	916	pl->ns->send_packet (sl);
1109	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	917	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1110	}	918	}
1111
1112	/**
1113	* Need to send an animation sequence to the client.
1114	* We will send appropriate face commands to the client if we haven't
1115	* sent them the face yet (this can become quite costly in terms of
1116	* how much we are sending - on the other hand, this should only happen
1117	* when the player logs in and picks stuff up.
1118	*/
1119	void
1120	esrv_send_animation (client * ns, short anim_num)
1121	{
1122	/* Do some checking on the anim_num we got. Note that the animations
1123	* are added in contigous order, so if the number is in the valid
1124	* range, it must be a valid animation.
1125	*/
1126	if (anim_num < 0 || anim_num > num_animations)
1127	{
1128	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1129	return;
1130	}
1131
1132	packet sl ("anim");
1133
1134	sl << uint16 (anim_num)
1135	<< uint16 (0); /* flags - not used right now */
1136
1137	/* Build up the list of faces. Also, send any information (ie, the
1138	* the face itself) down to the client.
1139	*/
1140	for (int i = 0; i < animations[anim_num].num_animations; i++)
1141	{
1142	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1143	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1144
1145	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1146	}
1147
1148	ns->send_packet (sl);
1149
1150	ns->anims_sent[anim_num] = 1;
1151	}
1152
1153		919
1154	/******************************************************************************	920	/******************************************************************************
1155	*	921	*
1156	* Start of map related commands.	922	* Start of map related commands.
1157	*	923	*
…		…
1159		925
1160	/** Clears a map cell */	926	/** Clears a map cell */
1161	static void	927	static void
1162	map_clearcell (struct MapCell *cell, int count)	928	map_clearcell (struct MapCell *cell, int count)
1163	{	929	{
1164	cell->faces[0] = 0;	930	cell->faces[0] = 0;
1165	cell->faces[1] = 0;	931	cell->faces[1] = 0;
1166	cell->faces[2] = 0;	932	cell->faces[2] = 0;
		933	cell->smooth[0] = 0;
		934	cell->smooth[1] = 0;
		935	cell->smooth[2] = 0;
1167	cell->count = count;	936	cell->count = count;
1168	cell->stat_hp = 0;	937	cell->stat_hp = 0;
1169	cell->flags = 0;	938	cell->flags = 0;
1170	cell->player = 0;	939	cell->player = 0;
1171	}	940	}
1172		941
1173	#define MAX_LAYERS 3	942	#define MAX_LAYERS 3
1174		943
1175	/**	944	/**
…		…
1178	* it was.	947	* it was.
1179	* sl is the socklist this data is going into.	948	* sl is the socklist this data is going into.
1180	* ns is the socket we are working on - all the info we care	949	* ns is the socket we are working on - all the info we care
1181	* about is in this socket structure, so now need not pass the	950	* about is in this socket structure, so now need not pass the
1182	* entire player object.	951	* entire player object.
1183	* mx and my are map coordinate offsets for map mp
1184	* sx and sy are the offsets into the socket structure that
1185	* holds the old values.
1186	* layer is the layer to update, with 2 being the floor and 0 the	952	* layer is the layer to update, with 2 being the floor and 0 the
1187	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	953	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1188	* take. Interesting to note that before this function, the map1 function	954	* take. Interesting to note that before this function, the map1 function
1189	* numbers the spaces differently - I think this was a leftover from	955	* numbers the spaces differently - I think this was a leftover from
1190	* the map command, where the faces stack up. Sinces that is no longer	956	* the map command, where the faces stack up. Sinces that is no longer
1191	* the case, it seems to make more sense to have these layer values	957	* the case, it seems to make more sense to have these layer values
1192	* actually match.	958	* actually match.
1193	*/	959	*/
1194	static int	960	static int
1195	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	961	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1196	{	962	{
1197	uint16 face_num;	963	object *ob = ms.faces_obj [layer];
1198	int bx, by, i;
1199
1200	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1201		964
1202	/* If there is no object for this space, or if the face for the object	965	/* If there is no object for this space, or if the face for the object
1203	* is the blank face, set the face number to zero.	966	* is the blank face, set the face number to zero.
1204	* else if we have the stored head object for this space, that takes	967	* else if we have the stored head object for this space, that takes
1205	* precedence over the other object for this space.	968	* precedence over the other object for this space.
1206	* otherwise, we do special head processing	969	* otherwise, we do special head processing
1207	*/	970	*/
1208	if (!ob || ob->face == blank_face)	971	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1209	face_num = 0;
1210	else
1211	/* In this case, we are already at the lower right or single part object,
1212	* so nothing special
1213	*/
1214	face_num = ob->face;
1215		972
1216	/* We've gotten what face we want to use for the object. Now see if	973	/* We've gotten what face we want to use for the object. Now see if
1217	* if it has changed since we last sent it to the client.	974	* if it has changed since we last sent it to the client.
1218	*/	975	*/
1219	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	976	if (lastcell.faces[layer] != face_num)
1220	{	977	{
1221	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	978	lastcell.faces[layer] = face_num;
		979
1222	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	980	if (!ns.faces_sent[face_num])
		981	if (ob)
		982	ns.send_faces (ob);
		983	else
1223	esrv_send_face (&ns, face_num, 0);	984	ns.send_face (face_num, 10);
1224		985
1225	sl << uint16 (face_num);	986	sl << uint16 (face_num);
1226	return 1;
1227	}
1228
1229	/* Nothing changed */
1230	return 0;
1231	}
1232
1233	/**
1234	* This function is mainly a copy of update_space,
1235	* except it handles update of the smoothing updates,
1236	* not the face updates.
1237	* Removes the need to replicate the same code for each layer.
1238	* this returns true if this smooth is now in fact different
1239	* than it was.
1240	* sl is the socklist this data is going into.
1241	* ns is the socket we are working on - all the info we care
1242	* about is in this socket structure, so know need to pass the
1243	* entire player object.
1244	* mx and my are map coordinate offsets for map mp
1245	* sx and sy are the offsets into the socket structure that
1246	* holds the old values.
1247	* layer is the layer to update, with 2 being the floor and 0 the
1248	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1249	* take.
1250	*/
1251	static inline int
1252	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1253	{
1254	object *ob;
1255	int smoothlevel; /* old face_num; */
1256
1257	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1258
1259	/* If there is no object for this space, or if the face for the object
1260	* is the blank face, set the smoothlevel to zero.
1261	*/
1262	if (!ob || ob->face == blank_face)
1263	smoothlevel = 0;
1264	else
1265	{
1266	smoothlevel = ob->smoothlevel;
1267	if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1268	SendSmooth (&ns, ob->face);
1269	} /* else not already head object or blank face */
1270
1271	/* We've gotten what face we want to use for the object. Now see if
1272	* if it has changed since we last sent it to the client.
1273	*/
1274	if (smoothlevel > 255)
1275	smoothlevel = 255;
1276	else if (smoothlevel < 0)
1277	smoothlevel = 0;
1278
1279	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1280	{
1281	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1282	sl << uint8 (smoothlevel);
1283	return 1;	987	return 1;
1284	}	988	}
1285		989
1286	/* Nothing changed */	990	/* Nothing changed */
1287	return 0;	991	return 0;
…		…
1327	{	1031	{
1328	prefetch_surrounding_maps (op->map, 3);	1032	prefetch_surrounding_maps (op->map, 3);
1329	}	1033	}
1330		1034
1331	/**	1035	/**
1332	* This function uses the new map1 protocol command to send the map	1036	* Draws client map.
1333	* to the client. It is necessary because the old map command supports
1334	* a maximum map size of 15x15.
1335	* This function is much simpler than the old one. This is because
1336	* the old function optimized to send as few face identifiers as possible,
1337	* at the expense of sending more coordinate location (coordinates were
1338	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1339	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1340	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1341	* and use the other 4 bits for other informatiion. For full documentation
1342	* of what we send, see the doc/Protocol file.
1343	* I will describe internally what we do:
1344	* the ns->lastmap shows how the map last looked when sent to the client.
1345	* in the lastmap structure, there is a cells array, which is set to the
1346	* maximum viewable size (As set in config.h).
1347	* in the cells, there are faces and a count value.
1348	* we use the count value to hold the darkness value. If -1, then this space
1349	* is not viewable.
1350	* we use faces[0] faces[1] faces[2] to hold what the three layers
1351	* look like.
1352	*/	1037	*/
1353	void	1038	void
1354	draw_client_map1 (object *pl)	1039	draw_client_map (player *pl)
1355	{	1040	{
		1041	object *ob = pl->observe;
		1042	if (!ob->active)
		1043	return;
		1044
		1045	maptile *plmap = ob->map;
		1046
		1047	/* If player is just joining the game, he isn't here yet, so the map
		1048	* can get swapped out. If so, don't try to send them a map. All will
		1049	* be OK once they really log in.
		1050	*/
		1051	if (!plmap || plmap->in_memory != MAP_ACTIVE)
		1052	return;
		1053
1356	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1054	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1357	sint16 nx, ny;
1358	int estartlen, eoldlen;	1055	int estartlen, eoldlen;
1359	uint16 mask, emask;
1360	uint8 eentrysize;	1056	uint8 eentrysize;
1361	uint16 ewhatstart, ewhatflag;	1057	uint16 ewhatstart, ewhatflag;
1362	uint8 extendedinfos;	1058	uint8 extendedinfos;
1363	maptile *m;
1364		1059
1365	client &socket = *pl->contr->ns;
1366
1367	if (!pl->active)
1368	return;
1369
1370	check_map_change (pl->contr);	1060	check_map_change (pl);
1371	prefetch_surrounding_maps (pl);	1061	prefetch_surrounding_maps (pl->ob);
		1062
		1063	/* do LOS after calls to update_position */
		1064	if (ob != pl->ob)
		1065	clear_los (pl);
		1066	else if (pl->do_los)
		1067	{
		1068	update_los (ob);
		1069	pl->do_los = 0;
		1070	}
		1071
		1072	/**
		1073	* This function uses the new map1 protocol command to send the map
		1074	* to the client. It is necessary because the old map command supports
		1075	* a maximum map size of 15x15.
		1076	* This function is much simpler than the old one. This is because
		1077	* the old function optimized to send as few face identifiers as possible,
		1078	* at the expense of sending more coordinate location (coordinates were
		1079	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		1080	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		1081	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		1082	* and use the other 4 bits for other informatiion. For full documentation
		1083	* of what we send, see the doc/Protocol file.
		1084	* I will describe internally what we do:
		1085	* the ns->lastmap shows how the map last looked when sent to the client.
		1086	* in the lastmap structure, there is a cells array, which is set to the
		1087	* maximum viewable size (As set in config.h).
		1088	* in the cells, there are faces and a count value.
		1089	* we use the count value to hold the darkness value. If -1, then this space
		1090	* is not viewable.
		1091	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1092	* look like.
		1093	*/
		1094
		1095	client &socket = *pl->ns;
1372		1096
1373	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1097	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1374	packet esl;	1098	packet esl;
1375		1099
1376	startlen = sl.length ();	1100	startlen = sl.length ();
…		…
1391	<< uint8 (extendedinfos)	1115	<< uint8 (extendedinfos)
1392	<< uint8 (eentrysize);	1116	<< uint8 (eentrysize);
1393		1117
1394	estartlen = esl.length ();	1118	estartlen = esl.length ();
1395	}	1119	}
1396	else
1397	{
1398	/* suppress compiler warnings */
1399	ewhatstart = 0;
1400	ewhatflag = 0;
1401	estartlen = 0;
1402	}
1403		1120
1404	/* x,y are the real map locations. ax, ay are viewport relative	1121	/* x,y are the real map locations. ax, ay are viewport relative
1405	* locations.	1122	* locations.
1406	*/	1123	*/
1407	ay = 0;	1124	ay = 0;
1408		1125
1409	/* We could do this logic as conditionals in the if statement,	1126	/* We could do this logic as conditionals in the if statement,
1410	* but that started to get a bit messy to look at.	1127	* but that started to get a bit messy to look at.
1411	*/	1128	*/
1412	max_x = pl->x + (socket.mapx + 1) / 2;	1129	max_x = ob->x + (socket.mapx + 1) / 2;
1413	max_y = pl->y + (socket.mapy + 1) / 2;	1130	max_y = ob->y + (socket.mapy + 1) / 2;
1414		1131
1415	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1132	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1416	{	1133	{
		1134	sint16 nx, ny;
		1135	maptile *m = 0;
		1136
1417	ax = 0;	1137	ax = 0;
1418	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1138	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1419	{	1139	{
		1140	// check to see if we can simply go one right quickly
		1141	++nx;
		1142	if (m && nx >= m->width)
		1143	m = 0;
		1144
		1145	if (!m)
		1146	{
		1147	nx = x; ny = y; m = plmap;
		1148
		1149	if (xy_normalise (m, nx, ny))
		1150	m->touch ();
		1151	else
		1152	m = 0;
		1153	}
		1154
		1155	int emask, mask;
1420	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1156	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1421		1157
1422	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1158	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1423
1424	d = pl->contr->blocked_los[ax][ay];
1425		1159
1426	/* If the coordinates are not valid, or it is too dark to see,	1160	/* If the coordinates are not valid, or it is too dark to see,
1427	* we tell the client as such	1161	* we tell the client as such
1428	*/	1162	*/
1429	nx = x;
1430	ny = y;
1431	m = get_map_from_coord (pl->map, &nx, &ny);
1432
1433	if (!m)	1163	if (!m)
1434	{	1164	{
1435	/* space is out of map. Update space and clear values	1165	/* space is out of map. Update space and clear values
1436	* if this hasn't already been done. If the space is out	1166	* if this hasn't already been done. If the space is out
1437	* of the map, it shouldn't have a head	1167	* of the map, it shouldn't have a head
…		…
1439	if (lastcell.count != -1)	1169	if (lastcell.count != -1)
1440	{	1170	{
1441	sl << uint16 (mask);	1171	sl << uint16 (mask);
1442	map_clearcell (&lastcell, -1);	1172	map_clearcell (&lastcell, -1);
1443	}	1173	}
		1174
		1175	continue;
1444	}	1176	}
		1177
		1178	int d = pl->blocked_los[ax][ay];
		1179
1445	else if (d > 3)	1180	if (d > 3)
1446	{	1181	{
1447	m->touch ();
1448		1182
1449	int need_send = 0, count;	1183	int need_send = 0, count;
1450		1184
1451	/* This block deals with spaces that are not visible for whatever	1185	/* This block deals with spaces that are not visible for whatever
1452	* reason. Still may need to send the head for this space.	1186	* reason. Still may need to send the head for this space.
…		…
1460	need_send = 1;	1194	need_send = 1;
1461		1195
1462	count = -1;	1196	count = -1;
1463		1197
1464	/* properly clear a previously sent big face */	1198	/* properly clear a previously sent big face */
1465	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1199	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1466	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1200	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1467	need_send = 1;	1201	need_send = 1;
1468		1202
1469	map_clearcell (&lastcell, count);	1203	map_clearcell (&lastcell, count);
1470		1204
…		…
1473	else	1207	else
1474	sl.reset (oldlen);	1208	sl.reset (oldlen);
1475	}	1209	}
1476	else	1210	else
1477	{	1211	{
1478	m->touch ();
1479
1480	/* In this block, the space is visible.	1212	/* In this block, the space is visible.
1481	*/	1213	*/
1482		1214
1483	/* Rather than try to figure out what everything that we might	1215	/* Rather than try to figure out what everything that we might
1484	* need to send is, then form the packet after that,	1216	* need to send is, then form the packet after that,
…		…
1488	* is done.	1220	* is done.
1489	* I think this is simpler than doing a bunch of checks to see	1221	* I think this is simpler than doing a bunch of checks to see
1490	* what if anything we need to send, setting the bits, then	1222	* what if anything we need to send, setting the bits, then
1491	* doing those checks again to add the real data.	1223	* doing those checks again to add the real data.
1492	*/	1224	*/
1493	oldlen = sl.length ();	1225	oldlen = sl.length ();
1494	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1495	eoldlen = esl.length ();	1226	eoldlen = esl.length ();
1496	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1227
1497	sl << uint16 (mask);	1228	sl << uint16 (mask);
1498
1499	if (socket.ext_mapinfos)
1500	esl << uint16 (emask);
1501		1229
1502	unsigned char dummy;	1230	unsigned char dummy;
1503	unsigned char *last_ext = &dummy;	1231	unsigned char *last_ext = &dummy;
1504		1232
1505	/* Darkness changed */	1233	/* Darkness changed */
…		…
1517	sl << uint8 (255 - 64 * d);	1245	sl << uint8 (255 - 64 * d);
1518	}	1246	}
1519		1247
1520	lastcell.count = d;	1248	lastcell.count = d;
1521		1249
		1250	mapspace &ms = m->at (nx, ny);
		1251	ms.update ();
		1252
1522	if (socket.extmap)	1253	if (socket.extmap)
1523	{	1254	{
1524	uint8 stat_hp = 0;	1255	uint8 stat_hp = 0;
1525	uint8 stat_width = 0;	1256	uint8 stat_width = 0;
1526	uint8 flags = 0;	1257	uint8 flags = 0;
1527	UUID player = 0;	1258	tag_t player = 0;
1528		1259
1529	// send hp information, if applicable	1260	// send hp information, if applicable
1530	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1261	if (object *op = ms.faces_obj [0])
		1262	if (op->is_head () && !op->invisible)
1531	{	1263	{
1532	if (op->head || op->invisible)	1264	if (op->stats.maxhp > op->stats.hp
1533	; // do not show	1265	&& op->stats.maxhp > 0
1534	else if (op->type == PLAYER	1266	&& (op->type == PLAYER
		1267	|| op->type == DOOR // does not work, have maxhp 0
1535	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1268	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1536	{
1537	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1538	{	1269	{
1539	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1270	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1540	stat_width = op->arch->tail_x;	1271	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1541	}	1272	}
1542	}
1543		1273
1544	if (op->msg && op->msg[0] == '@')	1274	if (op->msg && op->msg[0] == '@')
1545	flags |= 1;	1275	flags |= 1;
1546		1276
1547	if (op->type == PLAYER && op != pl)	1277	if (op->type == PLAYER && op != ob)
1548	player = op->count;	1278	player = op->count;
1549	}	1279	}
1550		1280
1551	if (lastcell.stat_hp != stat_hp)	1281	if (lastcell.stat_hp != stat_hp)
1552	{	1282	{
1553	lastcell.stat_hp = stat_hp;	1283	lastcell.stat_hp = stat_hp;
1554		1284
…		…
1573		1303
1574	mask |= 0x8;	1304	mask |= 0x8;
1575	*last_ext |= 0x80;	1305	*last_ext |= 0x80;
1576	last_ext = &sl[sl.length ()];	1306	last_ext = &sl[sl.length ()];
1577		1307
1578	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1308	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1579	}	1309	}
1580		1310
1581	if (lastcell.flags != flags)	1311	if (lastcell.flags != flags)
1582	{	1312	{
1583	lastcell.flags = flags;	1313	lastcell.flags = flags;
…		…
1589	sl << uint8 (8) << uint8 (flags);	1319	sl << uint8 (8) << uint8 (flags);
1590	}	1320	}
1591	}	1321	}
1592		1322
1593	/* Floor face */	1323	/* Floor face */
1594	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1324	if (update_space (sl, socket, ms, lastcell, 2))
1595	mask |= 0x4;	1325	mask |= 0x4;
1596		1326
1597	if (socket.EMI_smooth)
1598	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1599	emask |= 0x4;
1600
1601	/* Middle face */	1327	/* Middle face */
1602	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1328	if (update_space (sl, socket, ms, lastcell, 1))
1603	mask |= 0x2;	1329	mask |= 0x2;
1604		1330
1605	if (socket.EMI_smooth)	1331	if (ms.player () == ob
1606	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1332	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1607	emask |= 0x2;
1608
1609	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1610	{	1333	{
		1334	// force player to be visible to himself if invisible
1611	if (lastcell.faces[0] != pl->face)	1335	if (lastcell.faces[0] != ob->face)
1612	{	1336	{
1613	lastcell.faces[0] = pl->face;	1337	lastcell.faces[0] = ob->face;
		1338
1614	mask |= 0x1;	1339	mask |= 0x1;
1615
1616	if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1617	esrv_send_face (&socket, pl->face, 0);
1618
1619	sl << uint16 (pl->face);	1340	sl << uint16 (ob->face);
		1341
		1342	socket.send_faces (ob);
1620	}	1343	}
1621	}	1344	}
1622	else
1623	{
1624	/* Top face */	1345	/* Top face */
1625	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1346	else if (update_space (sl, socket, ms, lastcell, 0))
1626	mask |= 0x1;	1347	mask |= 0x1;
1627
1628	if (socket.EMI_smooth)
1629	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1630	emask |= 0x1;
1631	}
1632		1348
1633	/* Check to see if we are in fact sending anything for this	1349	/* Check to see if we are in fact sending anything for this
1634	* space by checking the mask. If so, update the mask.	1350	* space by checking the mask. If so, update the mask.
1635	* if not, reset the len to that from before adding the mask	1351	* if not, reset the len to that from before adding the mask
1636	* value, so we don't send those bits.	1352	* value, so we don't send those bits.
…		…
1638	if (mask & 0xf)	1354	if (mask & 0xf)
1639	sl[oldlen + 1] = mask & 0xff;	1355	sl[oldlen + 1] = mask & 0xff;
1640	else	1356	else
1641	sl.reset (oldlen);	1357	sl.reset (oldlen);
1642		1358
		1359	if (socket.ext_mapinfos)
		1360	esl << uint16 (emask);
		1361
		1362	if (socket.EMI_smooth)
		1363	{
		1364	for (int layer = 2+1; layer--; )
		1365	{
		1366	object *ob = ms.faces_obj [layer];
		1367
		1368	// If there is no object for this space, or if the face for the object
		1369	// is the blank face, set the smoothlevel to zero.
		1370	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1371
		1372	// We've gotten what face we want to use for the object. Now see if
		1373	// if it has changed since we last sent it to the client.
		1374	if (lastcell.smooth[layer] != smoothlevel)
		1375	{
		1376	lastcell.smooth[layer] = smoothlevel;
		1377	esl << uint8 (smoothlevel);
		1378	emask |= 1 << layer;
		1379	}
		1380	}
		1381
1643	if (emask & 0xf)	1382	if (emask & 0xf)
1644	esl[eoldlen + 1] = emask & 0xff;	1383	esl[eoldlen + 1] = emask & 0xff;
1645	else	1384	else
1646	esl.reset (eoldlen);	1385	esl.reset (eoldlen);
		1386	}
1647	} /* else this is a viewable space */	1387	} /* else this is a viewable space */
1648	} /* for x loop */	1388	} /* for x loop */
1649	} /* for y loop */	1389	} /* for y loop */
		1390
		1391	socket.flush_fx ();
1650		1392
1651	/* Verify that we in fact do need to send this */	1393	/* Verify that we in fact do need to send this */
1652	if (socket.ext_mapinfos)	1394	if (socket.ext_mapinfos)
1653	{	1395	{
1654	if (!(sl.length () > startlen || socket.sent_scroll))	1396	if (!(sl.length () > startlen || socket.sent_scroll))
1655	{	1397	{
1656	/* No map data will follow, so don't say the client	1398	/* No map data will follow, so don't say the client
1657	* it doesn't need draw!	1399	* it doesn't need draw!
1658	*/	1400	*/
1659	ewhatflag &= (~EMI_NOREDRAW);	1401	ewhatflag &= ~EMI_NOREDRAW;
1660	esl[ewhatstart + 1] = ewhatflag & 0xff;	1402	esl[ewhatstart + 1] = ewhatflag & 0xff;
1661	}	1403	}
1662		1404
1663	if (esl.length () > estartlen)	1405	if (esl.length () > estartlen)
1664	socket.send_packet (esl);	1406	socket.send_packet (esl);
…		…
1669	socket.send_packet (sl);	1411	socket.send_packet (sl);
1670	socket.sent_scroll = 0;	1412	socket.sent_scroll = 0;
1671	}	1413	}
1672	}	1414	}
1673		1415
1674	/**
1675	* Draws client map.
1676	*/
1677	void
1678	draw_client_map (object *pl)
1679	{
1680	int i, j;
1681	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1682	int mflags;
1683	struct Map newmap;
1684	maptile *m, *pm;
1685
1686	if (pl->type != PLAYER)
1687	{
1688	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1689	return;
1690	}
1691
1692	pm = pl->map;
1693
1694	/* If player is just joining the game, he isn't here yet, so the map
1695	* can get swapped out. If so, don't try to send them a map. All will
1696	* be OK once they really log in.
1697	*/
1698	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1699	return;
1700
1701	memset (&newmap, 0, sizeof (struct Map));
1702
1703	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1704	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1705	{
1706	ax = i;
1707	ay = j;
1708	m = pm;
1709	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1710
1711	if (mflags & P_OUT_OF_MAP)
1712	continue;
1713
1714	/* If a map is visible to the player, we don't want to swap it out
1715	* just to reload it. This should really call something like
1716	* swap_map, but this is much more efficient and 'good enough'
1717	*/
1718	if (mflags & P_NEW_MAP)
1719	m->timeout = 50;
1720	}
1721
1722	/* do LOS after calls to update_position */
1723	if (pl->contr->do_los)
1724	{
1725	update_los (pl);
1726	pl->contr->do_los = 0;
1727	}
1728
1729	/* Big maps need a different drawing mechanism to work */
1730	draw_client_map1 (pl);
1731	}
1732
1733
1734	/*****************************************************************************/	1416	/*****************************************************************************/
1735
1736	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1417	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1737
1738	/* a player. Of course, the client need to know the command to be able to */	1418	/* a player. Of course, the client need to know the command to be able to */
1739
1740	/* manage it ! */	1419	/* manage it ! */
1741
1742	/*****************************************************************************/	1420	/*****************************************************************************/
1743	void	1421	void
1744	send_plugin_custom_message (object *pl, char *buf)	1422	send_plugin_custom_message (object *pl, char *buf)
1745	{	1423	{
1746	pl->contr->ns->send_packet (buf);	1424	pl->contr->ns->send_packet (buf);
…		…
1757	sl << "replyinfo skill_info\n";	1435	sl << "replyinfo skill_info\n";
1758		1436
1759	for (int i = 1; i < NUM_SKILLS; i++)	1437	for (int i = 1; i < NUM_SKILLS; i++)
1760	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1438	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1761		1439
1762	if (sl.length () >= MAXSOCKBUF)	1440	if (sl.length () > MAXSOCKBUF)
1763	{	1441	{
1764	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1442	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1765	fatal (0);	1443	fatal (0);
1766	}	1444	}
1767		1445
…		…
1780	sl << "replyinfo spell_paths\n";	1458	sl << "replyinfo spell_paths\n";
1781		1459
1782	for (int i = 0; i < NRSPELLPATHS; i++)	1460	for (int i = 0; i < NRSPELLPATHS; i++)
1783	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1461	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1784		1462
1785	if (sl.length () >= MAXSOCKBUF)	1463	if (sl.length () > MAXSOCKBUF)
1786	{	1464	{
1787	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1465	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1788	fatal (0);	1466	fatal (0);
1789	}	1467	}
1790		1468
…		…
1809	if (spell->type == SPELL)	1487	if (spell->type == SPELL)
1810	{	1488	{
1811	int flags = 0;	1489	int flags = 0;
1812		1490
1813	/* check if we need to update it */	1491	/* check if we need to update it */
1814	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1492	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1815	{	1493	{
1816	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1494	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1817	flags |= UPD_SP_MANA;	1495	flags |= UPD_SP_MANA;
1818	}	1496	}
1819		1497
1820	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1498	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1821	{	1499	{
1822	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1500	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1823	flags |= UPD_SP_GRACE;	1501	flags |= UPD_SP_GRACE;
1824	}	1502	}
1825		1503
1826	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1504	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1827	{	1505	{
1828	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1506	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1829	flags |= UPD_SP_DAMAGE;	1507	flags |= UPD_SP_DAMAGE;
1830	}	1508	}
1831		1509
1832	if (flags)	1510	if (flags)
1833	{	1511	{
…		…
1835		1513
1836	sl << "updspell "	1514	sl << "updspell "
1837	<< uint8 (flags)	1515	<< uint8 (flags)
1838	<< uint32 (spell->count);	1516	<< uint32 (spell->count);
1839		1517
1840	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1518	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1841	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1519	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1842	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1520	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1843		1521
1844	pl->ns->send_packet (sl);	1522	pl->ns->send_packet (sl);
1845	}	1523	}
1846	}	1524	}
1847	}	1525	}
…		…
1877	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1555	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1878	return;	1556	return;
1879	}	1557	}
1880		1558
1881	/* store costs and damage in the object struct, to compare to later */	1559	/* store costs and damage in the object struct, to compare to later */
1882	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1560	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1883	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1561	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1884	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1562	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1885		1563
1886	/* figure out which skill it uses, if it uses one */	1564	/* figure out which skill it uses, if it uses one */
1887	if (spell->skill)	1565	if (spell->skill)
1888	{	1566	{
1889	for (i = 1; i < NUM_SKILLS; i++)	1567	for (i = 1; i < NUM_SKILLS; i++)
…		…
1899	{	1577	{
1900	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1578	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1901	spell->face = face_find ("burnout.x11", blank_face);	1579	spell->face = face_find ("burnout.x11", blank_face);
1902	}	1580	}
1903		1581
		1582	pl->ns->send_face (spell->face);
		1583
1904	/* send the current values */	1584	/* send the current values */
1905	sl << uint32 (spell->count)	1585	sl << uint32 (spell->count)
1906	<< uint16 (spell->level)	1586	<< uint16 (spell->level)
1907	<< uint16 (spell->casting_time)	1587	<< uint16 (spell->casting_time)
1908	<< uint16 (spell->last_sp)	1588	<< uint16 (spell->cached_sp)
1909	<< uint16 (spell->last_grace)	1589	<< uint16 (spell->cached_grace)
1910	<< uint16 (spell->last_eat)	1590	<< uint16 (spell->cached_eat)
1911	<< uint8 (skill)	1591	<< uint8 (skill)
1912	<< uint32 (spell->path_attuned)	1592	<< uint32 (spell->path_attuned)
1913	<< uint32 (spell->face)	1593	<< uint32 (spell->face)
1914	<< data8 (spell->name)	1594	<< data8 (spell->name)
1915	<< data16 (spell->msg);	1595	<< data16 (spell->msg);
…		…
1943	* bytes and 3 strings (because that is the spec) so we need to	1623	* bytes and 3 strings (because that is the spec) so we need to
1944	* check that the length of those 3 strings, plus the 23 bytes,	1624	* check that the length of those 3 strings, plus the 23 bytes,
1945	* won't take us over the length limit for the socket, if it does,	1625	* won't take us over the length limit for the socket, if it does,
1946	* we need to send what we already have, and restart packet formation	1626	* we need to send what we already have, and restart packet formation
1947	*/	1627	*/
		1628	if (spell->type != SPELL)
		1629	continue;
		1630
1948	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1631	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1949	* to show add_spell is 26 bytes + 2 strings. However, the overun	1632	* to show add_spell is 26 bytes + 2 strings. However, the overun
1950	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1633	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1951	* like it will fix this	1634	* like it will fix this
1952	*/	1635	*/
1953	if (spell->type != SPELL)
1954	continue;
1955
1956	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1636	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1957	{	1637	{
		1638	pl->ns->flush_fx ();
1958	pl->ns->send_packet (sl);	1639	pl->ns->send_packet (sl);
1959		1640
1960	sl.reset ();	1641	sl.reset ();
1961	sl << "addspell ";	1642	sl << "addspell ";
1962	}	1643	}
…		…
1970	return;	1651	return;
1971	}	1652	}
1972	else	1653	else
1973	append_spell (pl, sl, spell);	1654	append_spell (pl, sl, spell);
1974		1655
1975	if (sl.length () >= MAXSOCKBUF)	1656	if (sl.length () > MAXSOCKBUF)
1976	{	1657	{
1977	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1658	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1978	fatal (0);	1659	fatal (0);
1979	}	1660	}
1980		1661
1981	/* finally, we can send the packet */	1662	/* finally, we can send the packet */
		1663	pl->ns->flush_fx ();
1982	pl->ns->send_packet (sl);	1664	pl->ns->send_packet (sl);
1983	}	1665	}
1984		1666

Diff Legend

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