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.73 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.135 by root, Fri Aug 1 16:31:58 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	* Tells client the picture it has to use
689	* to smooth a picture number given as argument.
690	*/
691	void
692	AskSmooth (char *buf, int len, client *ns)
693	{
694	ns->send_smooth (atoi (buf));
695	}
696
697	/**
698	* 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,
699	* etc.)	531	* etc.)
700	*/	532	*/
701	void	533	void
702	PlayerCmd (char *buf, int len, player *pl)	534	PlayerCmd (char *buf, int len, player *pl)
…		…
723	* commands.	555	* commands.
724	*/	556	*/
725	pl->count = 0;	557	pl->count = 0;
726	}	558	}
727		559
728
729	/**	560	/**
730	* 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,
731	* 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
732	* '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
733	* can throttle.	564	* can throttle.
…		…
735	void	566	void
736	NewPlayerCmd (char *buf, int len, player *pl)	567	NewPlayerCmd (char *buf, int len, player *pl)
737	{	568	{
738	if (len <= 6)	569	if (len <= 6)
739	{	570	{
740	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);
741	return;	572	return;
742	}	573	}
743		574
744	uint16 cmdid = net_uint16 ((uint8 *)buf);	575	uint16 cmdid = net_uint16 ((uint8 *)buf);
745	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	576	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
802	{	633	{
803	case ST_PLAYING:	634	case ST_PLAYING:
804	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	635	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
805	break;	636	break;
806		637
807	case ST_CHANGE_CLASS:
808	key_change_class (pl->ob, buf[0]);
809	break;
810
811	case ST_GET_PARTY_PASSWORD: /* Get password for party */	638	case ST_GET_PARTY_PASSWORD: /* Get password for party */
812	receive_party_password (pl->ob, 13);	639	receive_party_password (pl->ob, 13);
813	break;	640	break;
814		641
815	default:	642	default:
…		…
854		681
855	cp = strchr (cp + 1, ' ');	682	cp = strchr (cp + 1, ' ');
856		683
857	if (cp)	684	if (cp)
858	{	685	{
859	assign (ns->version, cp + 1);	686	ns->version = cp + 1;
860		687
861	if (ns->sc_version < 1026)	688	if (ns->sc_version < 1026)
862	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	689	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
863	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	690	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
864	}	691	}
…		…
887	* syntax is: move (to) (tag) (nrof)	714	* syntax is: move (to) (tag) (nrof)
888	*/	715	*/
889	void	716	void
890	MoveCmd (char *buf, int len, player *pl)	717	MoveCmd (char *buf, int len, player *pl)
891	{	718	{
892	int vals[3], i;	719	int to, tag, nrof;
893		720
894	/* A little funky here. We only cycle for 2 records, because	721	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
895	* we obviously are not going to find a space after the third
896	* record. Perhaps we should just replace this with a
897	* sscanf?
898	*/
899	for (i = 0; i < 2; i++)
900	{	722	{
901	vals[i] = atoi (buf);
902
903	if (!(buf = strchr (buf, ' ')))
904	{
905	LOG (llevError, "Incomplete move command: %s\n", buf);	723	LOG (llevError, "Incomplete move command: %s\n", buf);
906	return;	724	return;
907	}
908
909	buf++;
910	}	725	}
911		726
912	vals[2] = atoi (buf);	727	esrv_move_object (pl->ob, to, tag, nrof);
913
914	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
915	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
916	}	728	}
917		729
918	/******************************************************************************	730	/******************************************************************************
919	*	731	*
920	* Start of commands the server sends to the client.	732	* Start of commands the server sends to the client.
…		…
924	/**	736	/**
925	* 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
926	* 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)
927	*/	739	*/
928	void	740	void
929	send_query (client *ns, uint8 flags, char *text)	741	send_query (client *ns, uint8 flags, const char *text)
930	{	742	{
931	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);
932	}	772	}
933		773
934	#define AddIfInt64(Old,New,Type) if (Old != New) {\	774	#define AddIfInt64(Old,New,Type) if (Old != New) {\
935	Old = New; \	775	Old = New; \
936	sl << uint8 (Type) << uint64 (New); \	776	sl << uint8 (Type) << uint64 (New); \
…		…
944	#define AddIfShort(Old,New,Type) if (Old != New) {\	784	#define AddIfShort(Old,New,Type) if (Old != New) {\
945	Old = New; \	785	Old = New; \
946	sl << uint8 (Type) << uint16 (New); \	786	sl << uint8 (Type) << uint16 (New); \
947	}	787	}
948		788
949	#define AddIfFloat(Old,New,Type) if (Old != New) {\	789	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
950	Old = New; \	790	Old = New; \
951	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	791	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
952	}	792	}
953		793
954	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	794	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
955	free(Old); Old = strdup (New);\	795	free(Old); Old = strdup (New);\
956	sl << uint8 (Type) << data8 (New); \	796	sl << uint8 (Type) << data8 (New); \
…		…
970		810
971	client *ns = pl->ns;	811	client *ns = pl->ns;
972	if (!ns)	812	if (!ns)
973	return;	813	return;
974		814
975	object *ob = pl->ob;	815	object *ob = pl->observe;
976	if (!ob)	816	if (!ob)
977	return;	817	return;
		818
		819	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
978		820
979	packet sl ("stats");	821	packet sl ("stats");
980		822
981	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	823	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
982	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	824	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
991	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	833	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
992	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	834	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
993	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	835	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
994		836
995	for (int s = 0; s < NUM_SKILLS; s++)	837	for (int s = 0; s < NUM_SKILLS; s++)
996	if (object *skill = pl->last_skill_ob[s])	838	if (object *skill = opl->last_skill_ob[s])
997	if (skill->stats.exp != ns->last_skill_exp [s])	839	if (skill->stats.exp != ns->last_skill_exp [s])
998	{	840	{
999	ns->last_skill_exp [s] = skill->stats.exp;	841	ns->last_skill_exp [s] = skill->stats.exp;
1000		842
1001	/* Always send along the level if exp changes. This is only	843	/* Always send along the level if exp changes. This is only
…		…
1009	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	851	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1010	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	852	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1011	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	853	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1012	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	854	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1013	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	855	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1014	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	856	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1015	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	857	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1016	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);
1017	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);
1018		860
1019	flags = 0;	861	flags = 0;
1020		862
1021	if (pl->fire_on)	863	if (opl->fire_on)
1022	flags |= SF_FIREON;	864	flags |= SF_FIREON;
1023		865
1024	if (pl->run_on)	866	if (opl->run_on)
1025	flags |= SF_RUNON;	867	flags |= SF_RUNON;
1026		868
1027	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	869	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1028		870
1029	if (ns->sc_version < 1025)	871	if (ns->sc_version < 1025)
…		…
1043	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);
1044	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);
1045	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);
1046	}	888	}
1047		889
1048	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 */
1049	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	891	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1050	set_title (ob, buf);	892	set_title (ob, buf);
1051	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	893	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1052		894
1053	/* Only send it away if we have some actual data */	895	/* Only send it away if we have some actual data */
…		…
1057		899
1058	/**	900	/**
1059	* 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.
1060	*/	902	*/
1061	void	903	void
1062	esrv_new_player (player *pl, uint32 weight)	904	esrv_new_player (player *pl)
1063	{	905	{
		906	sint32 weight = pl->ob->client_weight ();
		907
1064	packet sl ("player");	908	packet sl ("player");
1065		909
1066	sl << uint32 (pl->ob->count)	910	sl << uint32 (pl->ob->count)
1067	<< uint32 (weight)	911	<< uint32 (weight)
1068	<< uint32 (pl->ob->face)	912	<< uint32 (pl->ob->face)
…		…
1081		925
1082	/** Clears a map cell */	926	/** Clears a map cell */
1083	static void	927	static void
1084	map_clearcell (struct MapCell *cell, int count)	928	map_clearcell (struct MapCell *cell, int count)
1085	{	929	{
1086	cell->faces[0] = 0;	930	cell->faces[0] = 0;
1087	cell->faces[1] = 0;	931	cell->faces[1] = 0;
1088	cell->faces[2] = 0;	932	cell->faces[2] = 0;
		933	cell->smooth[0] = 0;
		934	cell->smooth[1] = 0;
		935	cell->smooth[2] = 0;
1089	cell->count = count;	936	cell->count = count;
1090	cell->stat_hp = 0;	937	cell->stat_hp = 0;
1091	cell->flags = 0;	938	cell->flags = 0;
1092	cell->player = 0;	939	cell->player = 0;
1093	}	940	}
1094		941
1095	#define MAX_LAYERS 3	942	#define MAX_LAYERS 3
1096		943
1097	/**	944	/**
…		…
1100	* it was.	947	* it was.
1101	* sl is the socklist this data is going into.	948	* sl is the socklist this data is going into.
1102	* 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
1103	* 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
1104	* entire player object.	951	* entire player object.
1105	* mx and my are map coordinate offsets for map mp
1106	* sx and sy are the offsets into the socket structure that
1107	* holds the old values.
1108	* layer is the layer to update, with 2 being the floor and 0 the	952	* layer is the layer to update, with 2 being the floor and 0 the
1109	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	953	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1110	* take. Interesting to note that before this function, the map1 function	954	* take. Interesting to note that before this function, the map1 function
1111	* numbers the spaces differently - I think this was a leftover from	955	* numbers the spaces differently - I think this was a leftover from
1112	* the map command, where the faces stack up. Sinces that is no longer	956	* the map command, where the faces stack up. Sinces that is no longer
1113	* the case, it seems to make more sense to have these layer values	957	* the case, it seems to make more sense to have these layer values
1114	* actually match.	958	* actually match.
1115	*/	959	*/
1116	static int	960	static int
1117	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)
1118	{	962	{
1119	uint16 face_num;	963	object *ob = ms.faces_obj [layer];
1120	int bx, by, i;
1121
1122	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1123		964
1124	/* 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
1125	* is the blank face, set the face number to zero.	966	* is the blank face, set the face number to zero.
1126	* 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
1127	* precedence over the other object for this space.	968	* precedence over the other object for this space.
1128	* otherwise, we do special head processing	969	* otherwise, we do special head processing
1129	*/	970	*/
1130	if (!ob || ob->face == blank_face)	971	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1131	face_num = 0;
1132	else
1133	/* In this case, we are already at the lower right or single part object,
1134	* so nothing special
1135	*/
1136	face_num = ob->face;
1137		972
1138	/* 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
1139	* 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.
1140	*/	975	*/
1141	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	976	if (lastcell.faces[layer] != face_num)
1142	{	977	{
1143	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	978	lastcell.faces[layer] = face_num;
1144		979
1145	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	980	if (!ns.faces_sent[face_num])
1146	if (ob)	981	if (ob)
1147	ns.send_faces (ob);	982	ns.send_faces (ob);
1148	else	983	else
1149	ns.send_face (face_num);	984	ns.send_face (face_num, 10);
1150		985
1151	sl << uint16 (face_num);	986	sl << uint16 (face_num);
1152	return 1;
1153	}
1154
1155	/* Nothing changed */
1156	return 0;
1157	}
1158
1159	/**
1160	* This function is mainly a copy of update_space,
1161	* except it handles update of the smoothing updates,
1162	* not the face updates.
1163	* Removes the need to replicate the same code for each layer.
1164	* this returns true if this smooth is now in fact different
1165	* than it was.
1166	* sl is the socklist this data is going into.
1167	* ns is the socket we are working on - all the info we care
1168	* about is in this socket structure, so know need to pass the
1169	* entire player object.
1170	* mx and my are map coordinate offsets for map mp
1171	* sx and sy are the offsets into the socket structure that
1172	* holds the old values.
1173	* layer is the layer to update, with 2 being the floor and 0 the
1174	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1175	* take.
1176	*/
1177	static inline int
1178	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1179	{
1180	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1181
1182	/* If there is no object for this space, or if the face for the object
1183	* is the blank face, set the smoothlevel to zero.
1184	*/
1185	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1186
1187	/* We've gotten what face we want to use for the object. Now see if
1188	* if it has changed since we last sent it to the client.
1189	*/
1190	if (smoothlevel > 255)
1191	smoothlevel = 255;
1192	else if (smoothlevel < 0)
1193	smoothlevel = 0;
1194
1195	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1196	{
1197	if (smoothlevel)
1198	ns.send_smooth (ob->face);
1199
1200	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1201	sl << uint8 (smoothlevel);
1202	return 1;	987	return 1;
1203	}	988	}
1204		989
1205	/* Nothing changed */	990	/* Nothing changed */
1206	return 0;	991	return 0;
…		…
1246	{	1031	{
1247	prefetch_surrounding_maps (op->map, 3);	1032	prefetch_surrounding_maps (op->map, 3);
1248	}	1033	}
1249		1034
1250	/**	1035	/**
1251	* This function uses the new map1 protocol command to send the map	1036	* Draws client map.
1252	* to the client. It is necessary because the old map command supports
1253	* a maximum map size of 15x15.
1254	* This function is much simpler than the old one. This is because
1255	* the old function optimized to send as few face identifiers as possible,
1256	* at the expense of sending more coordinate location (coordinates were
1257	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1258	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1259	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1260	* and use the other 4 bits for other informatiion. For full documentation
1261	* of what we send, see the doc/Protocol file.
1262	* I will describe internally what we do:
1263	* the ns->lastmap shows how the map last looked when sent to the client.
1264	* in the lastmap structure, there is a cells array, which is set to the
1265	* maximum viewable size (As set in config.h).
1266	* in the cells, there are faces and a count value.
1267	* we use the count value to hold the darkness value. If -1, then this space
1268	* is not viewable.
1269	* we use faces[0] faces[1] faces[2] to hold what the three layers
1270	* look like.
1271	*/	1037	*/
1272	void	1038	void
1273	draw_client_map1 (object *pl)	1039	draw_client_map (player *pl)
1274	{	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
1275	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	1054	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1276	sint16 nx, ny;
1277	int estartlen, eoldlen;	1055	int estartlen, eoldlen;
1278	uint8 eentrysize;	1056	uint8 eentrysize;
1279	uint16 ewhatstart, ewhatflag;	1057	uint16 ewhatstart, ewhatflag;
1280	uint8 extendedinfos;	1058	uint8 extendedinfos;
1281	maptile *m;
1282		1059
1283	client &socket = *pl->contr->ns;
1284
1285	if (!pl->active)
1286	return;
1287
1288	check_map_change (pl->contr);	1060	check_map_change (pl);
1289	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;
1290		1096
1291	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1097	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1292	packet esl;	1098	packet esl;
1293		1099
1294	startlen = sl.length ();	1100	startlen = sl.length ();
…		…
1309	<< uint8 (extendedinfos)	1115	<< uint8 (extendedinfos)
1310	<< uint8 (eentrysize);	1116	<< uint8 (eentrysize);
1311		1117
1312	estartlen = esl.length ();	1118	estartlen = esl.length ();
1313	}	1119	}
1314	else
1315	{
1316	/* suppress compiler warnings */
1317	ewhatstart = 0;
1318	ewhatflag = 0;
1319	estartlen = 0;
1320	}
1321		1120
1322	/* 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
1323	* locations.	1122	* locations.
1324	*/	1123	*/
1325	ay = 0;	1124	ay = 0;
1326		1125
1327	/* We could do this logic as conditionals in the if statement,	1126	/* We could do this logic as conditionals in the if statement,
1328	* but that started to get a bit messy to look at.	1127	* but that started to get a bit messy to look at.
1329	*/	1128	*/
1330	max_x = pl->x + (socket.mapx + 1) / 2;	1129	max_x = ob->x + (socket.mapx + 1) / 2;
1331	max_y = pl->y + (socket.mapy + 1) / 2;	1130	max_y = ob->y + (socket.mapy + 1) / 2;
1332		1131
1333	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++)
1334	{	1133	{
		1134	sint16 nx, ny;
		1135	maptile *m = 0;
		1136
1335	ax = 0;	1137	ax = 0;
1336	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++)
1337	{	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
1338	int emask, mask;	1155	int emask, mask;
1339	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1156	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1340		1157
1341	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1158	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1342		1159
1343	/* 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,
1344	* we tell the client as such	1161	* we tell the client as such
1345	*/	1162	*/
1346	nx = x;
1347	ny = y;
1348	m = get_map_from_coord (pl->map, &nx, &ny);
1349
1350	if (!m)	1163	if (!m)
1351	{	1164	{
1352	/* space is out of map. Update space and clear values	1165	/* space is out of map. Update space and clear values
1353	* 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
1354	* of the map, it shouldn't have a head	1167	* of the map, it shouldn't have a head
…		…
1360	}	1173	}
1361		1174
1362	continue;	1175	continue;
1363	}	1176	}
1364		1177
1365	m->touch ();
1366
1367	int d = pl->contr->blocked_los[ax][ay];	1178	int d = pl->blocked_los[ax][ay];
1368		1179
1369	if (d > 3)	1180	if (d > 3)
1370	{	1181	{
1371
1372	int need_send = 0, count;	1182	int need_send = 0, count;
1373		1183
1374	/* This block deals with spaces that are not visible for whatever	1184	/* This block deals with spaces that are not visible for whatever
1375	* reason. Still may need to send the head for this space.	1185	* reason. Still may need to send the head for this space.
1376	*/	1186	*/
…		…
1382	if (lastcell.count != -1)	1192	if (lastcell.count != -1)
1383	need_send = 1;	1193	need_send = 1;
1384		1194
1385	count = -1;	1195	count = -1;
1386		1196
1387	/* properly clear a previously sent big face */
1388	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]	1197	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1389	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1198	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1390	need_send = 1;	1199	need_send = 1;
1391		1200
		1201	/* properly clear a previously sent big face */
1392	map_clearcell (&lastcell, count);	1202	map_clearcell (&lastcell, count);
1393		1203
1394	if ((mask & 0xf) || need_send)	1204	if ((mask & 0xf) || need_send)
1395	sl[oldlen + 1] = mask & 0xff;	1205	sl[oldlen + 1] = mask & 0xff;
1396	else	1206	else
…		…
1414	oldlen = sl.length ();	1224	oldlen = sl.length ();
1415	eoldlen = esl.length ();	1225	eoldlen = esl.length ();
1416		1226
1417	sl << uint16 (mask);	1227	sl << uint16 (mask);
1418		1228
1419	if (socket.ext_mapinfos)
1420	esl << uint16 (emask);
1421
1422	unsigned char dummy;	1229	unsigned char dummy;
1423	unsigned char *last_ext = &dummy;	1230	unsigned char *last_ext = &dummy;
1424		1231
1425	/* Darkness changed */	1232	/* Darkness changed */
1426	if (lastcell.count != d && socket.darkness)	1233	if (lastcell.count != d && socket.darkness)
…		…
1437	sl << uint8 (255 - 64 * d);	1244	sl << uint8 (255 - 64 * d);
1438	}	1245	}
1439		1246
1440	lastcell.count = d;	1247	lastcell.count = d;
1441		1248
		1249	mapspace &ms = m->at (nx, ny);
		1250	ms.update ();
		1251
1442	if (socket.extmap)	1252	if (socket.extmap)
1443	{	1253	{
1444	uint8 stat_hp = 0;	1254	uint8 stat_hp = 0;
1445	uint8 stat_width = 0;	1255	uint8 stat_width = 0;
1446	uint8 flags = 0;	1256	uint8 flags = 0;
1447	UUID player = 0;	1257	tag_t player = 0;
1448		1258
1449	// send hp information, if applicable	1259	// send hp information, if applicable
1450	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1260	if (object *op = ms.faces_obj [0])
1451	{
1452	if (op->head || op->invisible)	1261	if (op->is_head () && !op->invisible)
1453	; // do not show
1454	else if (op->type == PLAYER
1455	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1456	{	1262	{
1457	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)	1263	if (op->stats.maxhp > op->stats.hp
		1264	&& op->stats.maxhp > 0
		1265	&& (op->type == PLAYER
		1266	|| op->type == DOOR // does not work, have maxhp 0
		1267	|| QUERY_FLAG (op, FLAG_MONSTER)
		1268	|| QUERY_FLAG (op, FLAG_ALIVE)
		1269	|| QUERY_FLAG (op, FLAG_GENERATOR)))
1458	{	1270	{
1459	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1271	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1460	stat_width = op->arch->tail_x;	1272	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1461	}	1273	}
1462	}
1463		1274
1464	if (op->msg && op->msg[0] == '@')	1275	if (op->has_dialogue ())
1465	flags |= 1;	1276	flags |= 1;
1466		1277
1467	if (op->type == PLAYER && op != pl)	1278	if (op->type == PLAYER)
1468	player = op->count;	1279	player = ob == op ? pl->ob->count : op->count;
1469	}	1280	}
1470		1281
1471	if (lastcell.stat_hp != stat_hp)	1282	if (lastcell.stat_hp != stat_hp)
1472	{	1283	{
1473	lastcell.stat_hp = stat_hp;	1284	lastcell.stat_hp = stat_hp;
1474		1285
…		…
1493		1304
1494	mask |= 0x8;	1305	mask |= 0x8;
1495	*last_ext |= 0x80;	1306	*last_ext |= 0x80;
1496	last_ext = &sl[sl.length ()];	1307	last_ext = &sl[sl.length ()];
1497		1308
1498	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1309	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1499	}	1310	}
1500		1311
1501	if (lastcell.flags != flags)	1312	if (lastcell.flags != flags)
1502	{	1313	{
1503	lastcell.flags = flags;	1314	lastcell.flags = flags;
…		…
1509	sl << uint8 (8) << uint8 (flags);	1320	sl << uint8 (8) << uint8 (flags);
1510	}	1321	}
1511	}	1322	}
1512		1323
1513	/* Floor face */	1324	/* Floor face */
1514	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1325	if (update_space (sl, socket, ms, lastcell, 2))
1515	mask |= 0x4;	1326	mask |= 0x4;
1516		1327
1517	if (socket.EMI_smooth)
1518	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1519	emask |= 0x4;
1520
1521	/* Middle face */	1328	/* Middle face */
1522	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1329	if (update_space (sl, socket, ms, lastcell, 1))
1523	mask |= 0x2;	1330	mask |= 0x2;
1524		1331
1525	if (socket.EMI_smooth)	1332	if (ms.player () == ob
1526	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1333	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1527	emask |= 0x2;
1528
1529	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1530	{	1334	{
		1335	// force player to be visible to himself if invisible
1531	if (lastcell.faces[0] != pl->face)	1336	if (lastcell.faces[0] != ob->face)
1532	{	1337	{
1533	lastcell.faces[0] = pl->face;	1338	lastcell.faces[0] = ob->face;
		1339
1534	mask |= 0x1;	1340	mask |= 0x1;
1535
1536	socket.send_faces (pl);
1537
1538	sl << uint16 (pl->face);	1341	sl << uint16 (ob->face);
		1342
		1343	socket.send_faces (ob);
1539	}	1344	}
1540	}	1345	}
1541	else
1542	{
1543	/* Top face */	1346	/* Top face */
1544	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1347	else if (update_space (sl, socket, ms, lastcell, 0))
1545	mask |= 0x1;	1348	mask |= 0x1;
1546
1547	if (socket.EMI_smooth)
1548	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1549	emask |= 0x1;
1550	}
1551		1349
1552	/* Check to see if we are in fact sending anything for this	1350	/* Check to see if we are in fact sending anything for this
1553	* space by checking the mask. If so, update the mask.	1351	* space by checking the mask. If so, update the mask.
1554	* if not, reset the len to that from before adding the mask	1352	* if not, reset the len to that from before adding the mask
1555	* value, so we don't send those bits.	1353	* value, so we don't send those bits.
…		…
1557	if (mask & 0xf)	1355	if (mask & 0xf)
1558	sl[oldlen + 1] = mask & 0xff;	1356	sl[oldlen + 1] = mask & 0xff;
1559	else	1357	else
1560	sl.reset (oldlen);	1358	sl.reset (oldlen);
1561		1359
		1360	if (socket.ext_mapinfos)
		1361	esl << uint16 (emask);
		1362
		1363	if (socket.EMI_smooth)
		1364	{
		1365	for (int layer = 2+1; layer--; )
		1366	{
		1367	object *ob = ms.faces_obj [layer];
		1368
		1369	// If there is no object for this space, or if the face for the object
		1370	// is the blank face, set the smoothlevel to zero.
		1371	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1372
		1373	// We've gotten what face we want to use for the object. Now see if
		1374	// if it has changed since we last sent it to the client.
		1375	if (lastcell.smooth[layer] != smoothlevel)
		1376	{
		1377	lastcell.smooth[layer] = smoothlevel;
		1378	esl << uint8 (smoothlevel);
		1379	emask |= 1 << layer;
		1380	}
		1381	}
		1382
1562	if (emask & 0xf)	1383	if (emask & 0xf)
1563	esl[eoldlen + 1] = emask & 0xff;	1384	esl[eoldlen + 1] = emask & 0xff;
1564	else	1385	else
1565	esl.reset (eoldlen);	1386	esl.reset (eoldlen);
		1387	}
1566	} /* else this is a viewable space */	1388	} /* else this is a viewable space */
1567	} /* for x loop */	1389	} /* for x loop */
1568	} /* for y loop */	1390	} /* for y loop */
		1391
		1392	socket.flush_fx ();
1569		1393
1570	/* Verify that we in fact do need to send this */	1394	/* Verify that we in fact do need to send this */
1571	if (socket.ext_mapinfos)	1395	if (socket.ext_mapinfos)
1572	{	1396	{
1573	if (!(sl.length () > startlen || socket.sent_scroll))	1397	if (!(sl.length () > startlen || socket.sent_scroll))
…		…
1588	socket.send_packet (sl);	1412	socket.send_packet (sl);
1589	socket.sent_scroll = 0;	1413	socket.sent_scroll = 0;
1590	}	1414	}
1591	}	1415	}
1592		1416
1593	/**
1594	* Draws client map.
1595	*/
1596	void
1597	draw_client_map (object *pl)
1598	{
1599	int i, j;
1600	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1601	int mflags;
1602	struct Map newmap;
1603	maptile *m, *pm;
1604
1605	if (pl->type != PLAYER)
1606	{
1607	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1608	return;
1609	}
1610
1611	pm = pl->map;
1612
1613	/* If player is just joining the game, he isn't here yet, so the map
1614	* can get swapped out. If so, don't try to send them a map. All will
1615	* be OK once they really log in.
1616	*/
1617	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1618	return;
1619
1620	memset (&newmap, 0, sizeof (struct Map));
1621
1622	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1623	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1624	{
1625	ax = i;
1626	ay = j;
1627	m = pm;
1628	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1629
1630	if (mflags & P_OUT_OF_MAP)
1631	continue;
1632
1633	/* If a map is visible to the player, we don't want to swap it out
1634	* just to reload it. This should really call something like
1635	* swap_map, but this is much more efficient and 'good enough'
1636	*/
1637	if (mflags & P_NEW_MAP)
1638	m->timeout = 50;
1639	}
1640
1641	/* do LOS after calls to update_position */
1642	if (pl->contr->do_los)
1643	{
1644	update_los (pl);
1645	pl->contr->do_los = 0;
1646	}
1647
1648	/* Big maps need a different drawing mechanism to work */
1649	draw_client_map1 (pl);
1650	}
1651
1652
1653	/*****************************************************************************/	1417	/*****************************************************************************/
1654
1655	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1418	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1656
1657	/* a player. Of course, the client need to know the command to be able to */	1419	/* a player. Of course, the client need to know the command to be able to */
1658
1659	/* manage it ! */	1420	/* manage it ! */
1660
1661	/*****************************************************************************/	1421	/*****************************************************************************/
1662	void	1422	void
1663	send_plugin_custom_message (object *pl, char *buf)	1423	send_plugin_custom_message (object *pl, char *buf)
1664	{	1424	{
1665	pl->contr->ns->send_packet (buf);	1425	pl->contr->ns->send_packet (buf);
…		…
1676	sl << "replyinfo skill_info\n";	1436	sl << "replyinfo skill_info\n";
1677		1437
1678	for (int i = 1; i < NUM_SKILLS; i++)	1438	for (int i = 1; i < NUM_SKILLS; i++)
1679	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1439	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1680		1440
1681	if (sl.length () >= MAXSOCKBUF)	1441	if (sl.length () > MAXSOCKBUF)
1682	{	1442	{
1683	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1443	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1684	fatal (0);	1444	fatal (0);
1685	}	1445	}
1686		1446
…		…
1699	sl << "replyinfo spell_paths\n";	1459	sl << "replyinfo spell_paths\n";
1700		1460
1701	for (int i = 0; i < NRSPELLPATHS; i++)	1461	for (int i = 0; i < NRSPELLPATHS; i++)
1702	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1462	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1703		1463
1704	if (sl.length () >= MAXSOCKBUF)	1464	if (sl.length () > MAXSOCKBUF)
1705	{	1465	{
1706	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1466	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1707	fatal (0);	1467	fatal (0);
1708	}	1468	}
1709		1469
…		…
1728	if (spell->type == SPELL)	1488	if (spell->type == SPELL)
1729	{	1489	{
1730	int flags = 0;	1490	int flags = 0;
1731		1491
1732	/* check if we need to update it */	1492	/* check if we need to update it */
1733	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1493	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1734	{	1494	{
1735	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1495	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1736	flags |= UPD_SP_MANA;	1496	flags |= UPD_SP_MANA;
1737	}	1497	}
1738		1498
1739	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1499	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1740	{	1500	{
1741	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1501	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1742	flags |= UPD_SP_GRACE;	1502	flags |= UPD_SP_GRACE;
1743	}	1503	}
1744		1504
1745	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1505	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1746	{	1506	{
1747	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1507	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1748	flags |= UPD_SP_DAMAGE;	1508	flags |= UPD_SP_DAMAGE;
1749	}	1509	}
1750		1510
1751	if (flags)	1511	if (flags)
1752	{	1512	{
…		…
1754		1514
1755	sl << "updspell "	1515	sl << "updspell "
1756	<< uint8 (flags)	1516	<< uint8 (flags)
1757	<< uint32 (spell->count);	1517	<< uint32 (spell->count);
1758		1518
1759	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1519	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1760	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1520	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1761	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1521	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1762		1522
1763	pl->ns->send_packet (sl);	1523	pl->ns->send_packet (sl);
1764	}	1524	}
1765	}	1525	}
1766	}	1526	}
…		…
1796	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1556	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1797	return;	1557	return;
1798	}	1558	}
1799		1559
1800	/* store costs and damage in the object struct, to compare to later */	1560	/* store costs and damage in the object struct, to compare to later */
1801	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1561	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1802	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1562	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1803	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1563	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1804		1564
1805	/* figure out which skill it uses, if it uses one */	1565	/* figure out which skill it uses, if it uses one */
1806	if (spell->skill)	1566	if (spell->skill)
1807	{	1567	{
1808	for (i = 1; i < NUM_SKILLS; i++)	1568	for (i = 1; i < NUM_SKILLS; i++)
…		…
1818	{	1578	{
1819	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1579	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1820	spell->face = face_find ("burnout.x11", blank_face);	1580	spell->face = face_find ("burnout.x11", blank_face);
1821	}	1581	}
1822		1582
		1583	pl->ns->send_face (spell->face);
		1584
1823	/* send the current values */	1585	/* send the current values */
1824	sl << uint32 (spell->count)	1586	sl << uint32 (spell->count)
1825	<< uint16 (spell->level)	1587	<< uint16 (spell->level)
1826	<< uint16 (spell->casting_time)	1588	<< uint16 (spell->casting_time)
1827	<< uint16 (spell->last_sp)	1589	<< uint16 (spell->cached_sp)
1828	<< uint16 (spell->last_grace)	1590	<< uint16 (spell->cached_grace)
1829	<< uint16 (spell->last_eat)	1591	<< uint16 (spell->cached_eat)
1830	<< uint8 (skill)	1592	<< uint8 (skill)
1831	<< uint32 (spell->path_attuned)	1593	<< uint32 (spell->path_attuned)
1832	<< uint32 (spell->face)	1594	<< uint32 (spell->face)
1833	<< data8 (spell->name)	1595	<< data8 (spell->name)
1834	<< data16 (spell->msg);	1596	<< data16 (spell->msg);
…		…
1862	* bytes and 3 strings (because that is the spec) so we need to	1624	* bytes and 3 strings (because that is the spec) so we need to
1863	* check that the length of those 3 strings, plus the 23 bytes,	1625	* check that the length of those 3 strings, plus the 23 bytes,
1864	* won't take us over the length limit for the socket, if it does,	1626	* won't take us over the length limit for the socket, if it does,
1865	* we need to send what we already have, and restart packet formation	1627	* we need to send what we already have, and restart packet formation
1866	*/	1628	*/
		1629	if (spell->type != SPELL)
		1630	continue;
		1631
1867	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1632	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1868	* to show add_spell is 26 bytes + 2 strings. However, the overun	1633	* to show add_spell is 26 bytes + 2 strings. However, the overun
1869	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1634	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1870	* like it will fix this	1635	* like it will fix this
1871	*/	1636	*/
1872	if (spell->type != SPELL)
1873	continue;
1874
1875	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1637	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1876	{	1638	{
		1639	pl->ns->flush_fx ();
1877	pl->ns->send_packet (sl);	1640	pl->ns->send_packet (sl);
1878		1641
1879	sl.reset ();	1642	sl.reset ();
1880	sl << "addspell ";	1643	sl << "addspell ";
1881	}	1644	}
…		…
1889	return;	1652	return;
1890	}	1653	}
1891	else	1654	else
1892	append_spell (pl, sl, spell);	1655	append_spell (pl, sl, spell);
1893		1656
1894	if (sl.length () >= MAXSOCKBUF)	1657	if (sl.length () > MAXSOCKBUF)
1895	{	1658	{
1896	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1659	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1897	fatal (0);	1660	fatal (0);
1898	}	1661	}
1899		1662
1900	/* finally, we can send the packet */	1663	/* finally, we can send the packet */
		1664	pl->ns->flush_fx ();
1901	pl->ns->send_packet (sl);	1665	pl->ns->send_packet (sl);
1902	}	1666	}
1903		1667

Diff Legend

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