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.80 by root, Fri Mar 16 02:51:08 2007 UTC vs.
Revision 1.134 by root, Mon Jul 14 23:57:46 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));
136		137
137	pl->ns->force_newmap = false;	138	pl->ns->force_newmap = false;
138		139
139	if (pl->ns->newmapcmd == 1)	140	if (pl->ns->newmapcmd == 1)
140	pl->ns->send_packet ("newmap");	141	pl->ns->send_packet ("newmap");
141		142
142	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	}
143	}	170	}
144		171
145	/** check for map/region change and send new map data */	172	/** check for map/region change and send new map data */
146	static void	173	static void
147	check_map_change (player *pl)	174	check_map_change (player *pl)
148	{	175	{
149	client &socket = *pl->ns;	176	client &socket = *pl->ns;
150	object *ob = pl->ob;	177	object *ob = pl->observe;
151	char buf[MAX_BUF]; /* eauugggh */
152		178
153	if (socket.force_newmap && 0)	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;
154	{	184	}
155	// force newmap is used for clients that do not redraw their map	185
156	// after image uploads.	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	{
157	socket.current_map = ob->map;	196	socket.current_map = ob->map;
158	clear_map (pl);	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	}
159	}	204	}
160	else if (socket.current_map != ob->map)	205
		206	if (socket.current_map != ob->map || socket.force_newmap)
161	{	207	{
162	clear_map (pl);	208	clear_map (pl);
163	socket.current_map = ob->map;	209	socket.current_map = ob->map;
164		210	send_map_info (pl);
165	if (socket.mapinfocmd)
166	{
167	if (ob->map && ob->map->path[0])
168	{
169	int flags = 0;
170
171	if (ob->map->tile_path[0])
172	flags |= 1;
173	if (ob->map->tile_path[1])
174	flags |= 2;
175	if (ob->map->tile_path[2])
176	flags |= 4;
177	if (ob->map->tile_path[3])
178	flags |= 8;
179
180	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182	}
183	else
184	snprintf (buf, MAX_BUF, "mapinfo current");
185
186	socket.send_packet (buf);
187	}
188	}	211	}
189	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)
190	{	213	{
191	int dx = ob->x - socket.current_x;	214	int dx = ob->x - socket.current_x;
192	int dy = ob->y - socket.current_y;	215	int dy = ob->y - socket.current_y;
…		…
200	}	223	}
201	}	224	}
202		225
203	socket.current_x = ob->x;	226	socket.current_x = ob->x;
204	socket.current_y = ob->y;	227	socket.current_y = ob->y;
205
206	region *reg = ob->region ();
207	if (socket.current_region != reg)
208	{
209	socket.current_region = reg;
210	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
211	}
212	}	228	}
213		229
214	/**	230	/**
215	* RequestInfo is sort of a meta command. There is some specific	231	* RequestInfo is sort of a meta command. There is some specific
216	* request of information, but we call other functions to provide	232	* request of information, but we call other functions to provide
217	* that information.	233	* that information.
218	*/	234	*/
219	void	235	void
220	RequestInfo (char *buf, int len, client * ns)	236	RequestInfo (char *buf, int len, client *ns)
221	{	237	{
222	char *params = NULL, *cp;	238	char *params;
223
224	/* No match */
225	char bigbuf[MAX_BUF];
226	int slen;
227
228	/* Set up replyinfo before we modify any of the buffers - this is used
229	* if we don't find a match.
230	*/
231	strcpy (bigbuf, "replyinfo ");
232	slen = strlen (bigbuf);
233	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234		239
235	/* find the first space, make it null, and update the	240	/* find the first space, make it null, and update the
236	* params pointer.	241	* params pointer.
237	*/	242	*/
238	for (cp = buf; *cp != '\0'; cp++)	243	for (params = buf; *params; params++)
239	if (*cp == ' ')	244	if (*params == ' ')
240	{	245	{
241	*cp = '\0';
242	params = cp + 1;	246	*params++ = 0;
243	break;	247	break;
244	}	248	}
245		249
246	if (!strcmp (buf, "image_info"))	250	if (!strcmp (buf, "image_info"))
247	send_image_info (ns, params);	251	send_image_info (ns, params);
…		…
250	else if (!strcmp (buf, "skill_info"))	254	else if (!strcmp (buf, "skill_info"))
251	send_skill_info (ns, params);	255	send_skill_info (ns, params);
252	else if (!strcmp (buf, "spell_paths"))	256	else if (!strcmp (buf, "spell_paths"))
253	send_spell_paths (ns, params);	257	send_spell_paths (ns, params);
254	else	258	else
255	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	}
256	}	266	}
257		267
258	void	268	void
259	ExtCmd (char *buf, int len, player *pl)	269	ExtCmd (char *buf, int len, player *pl)
260	{	270	{
…		…
263		273
264	void	274	void
265	ExtiCmd (char *buf, int len, client *ns)	275	ExtiCmd (char *buf, int len, client *ns)
266	{	276	{
267	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;
268	}	364	}
269		365
270	void	366	void
271	MapInfoCmd (char *buf, int len, player *pl)	367	MapInfoCmd (char *buf, int len, player *pl)
272	{	368	{
273	// <mapinfo tag spatial tile-path	369	// <mapinfo tag spatial tile-path
274	// >mapinfo tag spatial flags x y w h hash	370	// >mapinfo tag spatial flags x y w h hash
275		371
276	char bigbuf[MAX_BUF], *token;
277
278	token = buf;	372	char *token = buf;
279	// copy token	373
280	if (!(buf = strchr (buf, ' ')))	374	if (!(buf = strchr (buf, ' ')))
281	return;	375	return;
282		376
283	*buf++ = 0;
284
285	if (!strncmp (buf, "spatial ", 8))	377	if (!strncmp (buf, " spatial ", 9))
286	{	378	{
287	buf += 8;	379	char *copy = strdup (token);
		380	copy [buf - token] = 0;
288		381
289	// initial map and its origin	382	#if 0
290	maptile *map = pl->ob->map;	383	// this makes only sense when we flush the buffer immediately
291	sint16 dx, dy;	384	if (pl->ns->mapinfo_try (copy))
292	int mapx = pl->ns->mapx / 2 - pl->ob->x;	385	free (copy);
293	int mapy = pl->ns->mapy / 2 - pl->ob->y;
294	int max_distance = 8; // limit maximum path length to something generous
295
296	while (*buf && map && max_distance)
297	{
298	int dir = *buf++;
299
300	switch (dir)
301	{
302	case '1':
303	dx = 0;
304	dy = -1;
305	map = map->xy_find (dx, dy);
306	map && (mapy -= map->height);
307	break;
308	case '2':
309	mapx += map->width;
310	dx = map->width;
311	dy = 0;
312	map = map->xy_find (dx, dy);
313	break;
314	case '3':
315	mapy += map->height;
316	dx = 0;
317	dy = map->height;
318	map = map->xy_find (dx, dy);
319	break;
320	case '4':
321	dx = -1;
322	dy = 0;
323	map = map->xy_find (dx, dy);
324	map && (mapx -= map->width);
325	break;
326	}
327
328	--max_distance;
329	}
330
331	if (!max_distance)
332	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
333	else if (map && map->path[0])
334	{
335	int flags = 0;
336
337	if (map->tile_path[0])
338	flags |= 1;
339	if (map->tile_path[1])
340	flags |= 2;
341	if (map->tile_path[2])
342	flags |= 4;
343	if (map->tile_path[3])
344	flags |= 8;
345
346	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
347	}
348	else	386	else
349	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	387	#endif
		388	pl->ns->mapinfo_queue.push_back (copy);
350	}	389	}
351	else	390	else
352	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	391	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
353
354	pl->ns->send_packet (bigbuf);
355	}	392	}
356		393
357	/** This is the Setup cmd - easy first implementation */	394	/** This is the Setup cmd */
358	void	395	void
359	SetUp (char *buf, int len, client * ns)	396	SetUp (char *buf, int len, client * ns)
360	{	397	{
361	int s, slen;	398	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
362	char *cmd, *param, cmdback[HUGE_BUF];
363
364	/* run through the cmds of setup
365	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
366	*
367	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
368	* The client then must sort this out
369	*/
370
371	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
372
373	strcpy (cmdback, "setup");
374	for (s = 0; s < len; )
375	{
376	cmd = &buf[s];
377
378	/* find the next space, and put a null there */
379	for (; buf[s] && buf[s] != ' '; s++)
380	;
381
382	buf[s++] = 0;
383
384	while (buf[s] == ' ')
385	s++;
386
387	if (s >= len)
388	break;
389
390	param = &buf[s];
391
392	for (; buf[s] && buf[s] != ' '; s++)
393	;
394
395	buf[s++] = 0;
396
397	while (buf[s] == ' ')
398	s++;
399
400	slen = strlen (cmdback);
401	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
402	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
403	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
404
405	if (!strcmp (cmd, "sound"))
406	{
407	ns->sound = atoi (param);
408	safe_strcat (cmdback, param, &slen, HUGE_BUF);
409	}
410	else if (!strcmp (cmd, "exp64"))
411	safe_strcat (cmdback, param, &slen, HUGE_BUF);
412	else if (!strcmp (cmd, "spellmon"))
413	{
414	ns->monitor_spells = atoi (param);
415	safe_strcat (cmdback, param, &slen, HUGE_BUF);
416	}
417	else if (!strcmp (cmd, "darkness"))
418	{
419	ns->darkness = atoi (param);
420	safe_strcat (cmdback, param, &slen, HUGE_BUF);
421	}
422	else if (!strcmp (cmd, "map1cmd"))
423	{
424	if (atoi (param))
425	ns->mapmode = Map1Cmd;
426	/* if beyond this size, need to use map1cmd no matter what */
427	if (ns->mapx > 11 || ns->mapy > 11)
428	ns->mapmode = Map1Cmd;
429	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
430	}
431	else if (!strcmp (cmd, "map1acmd"))
432	{
433	if (atoi (param))
434	ns->mapmode = Map1aCmd;
435	/* if beyond this size, need to use map1acmd no matter what */
436	if (ns->mapx > 11 || ns->mapy > 11)
437	ns->mapmode = Map1aCmd;
438	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
439	}
440	else if (!strcmp (cmd, "newmapcmd"))
441	{
442	ns->newmapcmd = atoi (param);
443	safe_strcat (cmdback, param, &slen, HUGE_BUF);
444	}
445	else if (!strcmp (cmd, "mapinfocmd"))
446	{
447	ns->mapinfocmd = atoi (param);
448	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
449	}
450	else if (!strcmp (cmd, "extcmd"))
451	{
452	ns->extcmd = atoi (param);
453	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
454	}
455	else if (!strcmp (cmd, "extmap"))
456	{
457	ns->extmap = atoi (param);
458	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
459	}
460	else if (!strcmp (cmd, "facecache"))
461	{
462	ns->facecache = atoi (param);
463	safe_strcat (cmdback, param, &slen, HUGE_BUF);
464	}
465	else if (!strcmp (cmd, "faceset"))
466	{
467	char tmpbuf[20];
468	int q = atoi (param);
469
470	if (is_valid_faceset (q))
471	ns->faceset = q;
472
473	sprintf (tmpbuf, "%d", ns->faceset);
474	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
475	/* if the client is using faceset, it knows about image2 command */
476	ns->image2 = 1;
477	}
478	else if (!strcmp (cmd, "itemcmd"))
479	{
480	/* Version of the item protocol command to use. Currently,
481	* only supported versions are 1 and 2. Using a numeric
482	* value will make it very easy to extend this in the future.
483	*/
484	char tmpbuf[20];
485	int q = atoi (param);
486
487	if (q < 1 || q > 2)
488	{
489	strcpy (tmpbuf, "FALSE");
490	}
491	else
492	{
493	ns->itemcmd = q;
494	sprintf (tmpbuf, "%d", ns->itemcmd);
495	}
496	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
497	}
498	else if (!strcmp (cmd, "mapsize"))
499	{
500	int x, y = 0;
501	char tmpbuf[MAX_BUF], *cp;
502
503	x = atoi (param);
504	for (cp = param; *cp != 0; cp++)
505	if (*cp == 'x' || *cp == 'X')
506	{
507	y = atoi (cp + 1);
508	break;
509	}
510
511	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
512	{
513	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
514	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
515	}
516	else
517	{
518	ns->mapx = x;
519	ns->mapy = y;
520	/* better to send back what we are really using and not the
521	* param as given to us in case it gets parsed differently.
522	*/
523	sprintf (tmpbuf, "%dx%d", x, y);
524	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
525	/* If beyond this size and still using orig map command, need to
526	* go to map1cmd.
527	*/
528	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
529	ns->mapmode = Map1Cmd;
530	}
531	}
532	else if (!strcmp (cmd, "extendedMapInfos"))
533	{
534	/* Added by tchize
535	* prepare to use the mapextended command
536	*/
537	char tmpbuf[20];
538
539	ns->ext_mapinfos = (atoi (param));
540	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
541	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
542	}
543	else if (!strcmp (cmd, "extendedTextInfos"))
544	{
545	/* Added by tchize
546	* prepare to use the extended text commands
547	* Client toggle this to non zero to get exttext
548	*/
549	char tmpbuf[20];
550
551	ns->has_readable_type = (atoi (param));
552	sprintf (tmpbuf, "%d", ns->has_readable_type);
553	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
554	}
555	else
556	{
557	/* Didn't get a setup command we understood -
558	* report a failure to the client.
559	*/
560	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
561	}
562	} /* for processing all the setup commands */
563
564	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
565	ns->send_packet (cmdback);
566	}	399	}
567		400
568	/**	401	/**
569	* The client has requested to be added to the game.	402	* The client has requested to be added to the game.
570	* 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.
…		…
572	* 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.
573	*/	406	*/
574	void	407	void
575	AddMeCmd (char *buf, int len, client *ns)	408	AddMeCmd (char *buf, int len, client *ns)
576	{	409	{
577	// face caching is mandatory
578	if (!ns->facecache)
579	{
580	ns->send_drawinfo (
581	"\n"
582	"\n"
583	"***\n"
584	"*** WARNING:\n"
585	"*** Your client does not support face/image caching,\n"
586	"*** or it has been disabled. Face caching is mandatory\n"
587	"*** so please enable it or use a newer client.\n"
588	"***\n"
589	"*** Look at your client preferences:\n"
590	"***\n"
591	"*** CFPlus: all known versions automatically enable the facecache.\n"
592	"*** cfclient: use the -cache commandline option.\n"
593	"*** cfclient: map will not redraw automatically (bug).\n"
594	"*** gcfclient: use -cache commandline option, or enable\n"
595	"*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
596	"*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
597	"***\n"
598	"***\n",
599	NDI_RED
600	);
601
602	if (strstr (ns->version, "jcrossclient"))
603	/* let them, for now*/;
604	else
605	{
606	ns->flush ();
607	//ns->destroy ();
608	}
609	//ns->facecache = true;
610	}
611
612	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
613	}	411	}
614		412
615	/** Reply to ExtendedInfos command */	413	/** Reply to ExtendedInfos command */
616	void	414	void
…		…
727		525
728	ns->send_packet (cmdback);	526	ns->send_packet (cmdback);
729	}	527	}
730		528
731	/**	529	/**
732	* client requested an image. send it rate-limited
733	* before flushing.
734	*/
735	void
736	AskFaceCmd (char *buf, int len, client *ns)
737	{
738	ns->askface.push_back (atoi (buf));
739	}
740
741	/**
742	* Tells client the picture it has to use
743	* to smooth a picture number given as argument.
744	*/
745	void
746	AskSmooth (char *buf, int len, client *ns)
747	{
748	ns->send_face (atoi (buf));
749	}
750
751	/**
752	* 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,
753	* etc.)	531	* etc.)
754	*/	532	*/
755	void	533	void
756	PlayerCmd (char *buf, int len, player *pl)	534	PlayerCmd (char *buf, int len, player *pl)
…		…
777	* commands.	555	* commands.
778	*/	556	*/
779	pl->count = 0;	557	pl->count = 0;
780	}	558	}
781		559
782
783	/**	560	/**
784	* 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,
785	* 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
786	* '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
787	* can throttle.	564	* can throttle.
…		…
789	void	566	void
790	NewPlayerCmd (char *buf, int len, player *pl)	567	NewPlayerCmd (char *buf, int len, player *pl)
791	{	568	{
792	if (len <= 6)	569	if (len <= 6)
793	{	570	{
794	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);
795	return;	572	return;
796	}	573	}
797		574
798	uint16 cmdid = net_uint16 ((uint8 *)buf);	575	uint16 cmdid = net_uint16 ((uint8 *)buf);
799	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	576	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
856	{	633	{
857	case ST_PLAYING:	634	case ST_PLAYING:
858	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	635	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
859	break;	636	break;
860		637
861	case ST_CHANGE_CLASS:
862	key_change_class (pl->ob, buf[0]);
863	break;
864
865	case ST_GET_PARTY_PASSWORD: /* Get password for party */	638	case ST_GET_PARTY_PASSWORD: /* Get password for party */
866	receive_party_password (pl->ob, 13);	639	receive_party_password (pl->ob, 13);
867	break;	640	break;
868		641
869	default:	642	default:
…		…
908		681
909	cp = strchr (cp + 1, ' ');	682	cp = strchr (cp + 1, ' ');
910		683
911	if (cp)	684	if (cp)
912	{	685	{
913	assign (ns->version, cp + 1);	686	ns->version = cp + 1;
914		687
915	if (ns->sc_version < 1026)	688	if (ns->sc_version < 1026)
916	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	689	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
917	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	690	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
918	}	691	}
…		…
941	* syntax is: move (to) (tag) (nrof)	714	* syntax is: move (to) (tag) (nrof)
942	*/	715	*/
943	void	716	void
944	MoveCmd (char *buf, int len, player *pl)	717	MoveCmd (char *buf, int len, player *pl)
945	{	718	{
946	int vals[3], i;	719	int to, tag, nrof;
947		720
948	/* A little funky here. We only cycle for 2 records, because	721	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
949	* we obviously are not going to find a space after the third
950	* record. Perhaps we should just replace this with a
951	* sscanf?
952	*/
953	for (i = 0; i < 2; i++)
954	{	722	{
955	vals[i] = atoi (buf);
956
957	if (!(buf = strchr (buf, ' ')))
958	{
959	LOG (llevError, "Incomplete move command: %s\n", buf);	723	LOG (llevError, "Incomplete move command: %s\n", buf);
960	return;	724	return;
961	}
962
963	buf++;
964	}	725	}
965		726
966	vals[2] = atoi (buf);	727	esrv_move_object (pl->ob, to, tag, nrof);
967
968	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
969	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
970	}	728	}
971		729
972	/******************************************************************************	730	/******************************************************************************
973	*	731	*
974	* Start of commands the server sends to the client.	732	* Start of commands the server sends to the client.
…		…
978	/**	736	/**
979	* 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
980	* 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)
981	*/	739	*/
982	void	740	void
983	send_query (client *ns, uint8 flags, char *text)	741	send_query (client *ns, uint8 flags, const char *text)
984	{	742	{
985	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);
986	}	772	}
987		773
988	#define AddIfInt64(Old,New,Type) if (Old != New) {\	774	#define AddIfInt64(Old,New,Type) if (Old != New) {\
989	Old = New; \	775	Old = New; \
990	sl << uint8 (Type) << uint64 (New); \	776	sl << uint8 (Type) << uint64 (New); \
…		…
998	#define AddIfShort(Old,New,Type) if (Old != New) {\	784	#define AddIfShort(Old,New,Type) if (Old != New) {\
999	Old = New; \	785	Old = New; \
1000	sl << uint8 (Type) << uint16 (New); \	786	sl << uint8 (Type) << uint16 (New); \
1001	}	787	}
1002		788
1003	#define AddIfFloat(Old,New,Type) if (Old != New) {\	789	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
1004	Old = New; \	790	Old = New; \
1005	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	791	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1006	}	792	}
1007		793
1008	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	794	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1009	free(Old); Old = strdup (New);\	795	free(Old); Old = strdup (New);\
1010	sl << uint8 (Type) << data8 (New); \	796	sl << uint8 (Type) << data8 (New); \
…		…
1024		810
1025	client *ns = pl->ns;	811	client *ns = pl->ns;
1026	if (!ns)	812	if (!ns)
1027	return;	813	return;
1028		814
1029	object *ob = pl->ob;	815	object *ob = pl->observe;
1030	if (!ob)	816	if (!ob)
1031	return;	817	return;
		818
		819	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1032		820
1033	packet sl ("stats");	821	packet sl ("stats");
1034		822
1035	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	823	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1036	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	824	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
1045	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	833	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1046	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	834	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1047	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	835	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1048		836
1049	for (int s = 0; s < NUM_SKILLS; s++)	837	for (int s = 0; s < NUM_SKILLS; s++)
1050	if (object *skill = pl->last_skill_ob[s])	838	if (object *skill = opl->last_skill_ob[s])
1051	if (skill->stats.exp != ns->last_skill_exp [s])	839	if (skill->stats.exp != ns->last_skill_exp [s])
1052	{	840	{
1053	ns->last_skill_exp [s] = skill->stats.exp;	841	ns->last_skill_exp [s] = skill->stats.exp;
1054		842
1055	/* Always send along the level if exp changes. This is only	843	/* Always send along the level if exp changes. This is only
…		…
1063	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	851	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1064	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	852	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1065	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	853	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1066	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	854	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1067	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	855	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1068	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	856	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1069	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	857	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1070	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);
1071	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);
1072		860
1073	flags = 0;	861	flags = 0;
1074		862
1075	if (pl->fire_on)	863	if (opl->fire_on)
1076	flags |= SF_FIREON;	864	flags |= SF_FIREON;
1077		865
1078	if (pl->run_on)	866	if (opl->run_on)
1079	flags |= SF_RUNON;	867	flags |= SF_RUNON;
1080		868
1081	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	869	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1082		870
1083	if (ns->sc_version < 1025)	871	if (ns->sc_version < 1025)
…		…
1097	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);
1098	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);
1099	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);
1100	}	888	}
1101		889
1102	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 */
1103	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	891	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1104	set_title (ob, buf);	892	set_title (ob, buf);
1105	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	893	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1106		894
1107	/* Only send it away if we have some actual data */	895	/* Only send it away if we have some actual data */
…		…
1111		899
1112	/**	900	/**
1113	* 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.
1114	*/	902	*/
1115	void	903	void
1116	esrv_new_player (player *pl, uint32 weight)	904	esrv_new_player (player *pl)
1117	{	905	{
		906	sint32 weight = pl->ob->client_weight ();
		907
1118	packet sl ("player");	908	packet sl ("player");
1119		909
1120	sl << uint32 (pl->ob->count)	910	sl << uint32 (pl->ob->count)
1121	<< uint32 (weight)	911	<< uint32 (weight)
1122	<< uint32 (pl->ob->face)	912	<< uint32 (pl->ob->face)
…		…
1189		979
1190	if (!ns.faces_sent[face_num])	980	if (!ns.faces_sent[face_num])
1191	if (ob)	981	if (ob)
1192	ns.send_faces (ob);	982	ns.send_faces (ob);
1193	else	983	else
1194	ns.send_face (face_num);	984	ns.send_face (face_num, 10);
1195		985
1196	sl << uint16 (face_num);	986	sl << uint16 (face_num);
1197	return 1;	987	return 1;
1198	}	988	}
1199		989
…		…
1241	{	1031	{
1242	prefetch_surrounding_maps (op->map, 3);	1032	prefetch_surrounding_maps (op->map, 3);
1243	}	1033	}
1244		1034
1245	/**	1035	/**
1246	* This function uses the new map1 protocol command to send the map	1036	* Draws client map.
1247	* to the client. It is necessary because the old map command supports
1248	* a maximum map size of 15x15.
1249	* This function is much simpler than the old one. This is because
1250	* the old function optimized to send as few face identifiers as possible,
1251	* at the expense of sending more coordinate location (coordinates were
1252	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1253	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1254	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1255	* and use the other 4 bits for other informatiion. For full documentation
1256	* of what we send, see the doc/Protocol file.
1257	* I will describe internally what we do:
1258	* the ns->lastmap shows how the map last looked when sent to the client.
1259	* in the lastmap structure, there is a cells array, which is set to the
1260	* maximum viewable size (As set in config.h).
1261	* in the cells, there are faces and a count value.
1262	* we use the count value to hold the darkness value. If -1, then this space
1263	* is not viewable.
1264	* we use faces[0] faces[1] faces[2] to hold what the three layers
1265	* look like.
1266	*/	1037	*/
1267	void	1038	void
1268	draw_client_map1 (object *pl)	1039	draw_client_map (player *pl)
1269	{	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
1270	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	1054	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1271	sint16 nx, ny;
1272	int estartlen, eoldlen;	1055	int estartlen, eoldlen;
1273	uint8 eentrysize;	1056	uint8 eentrysize;
1274	uint16 ewhatstart, ewhatflag;	1057	uint16 ewhatstart, ewhatflag;
1275	uint8 extendedinfos;	1058	uint8 extendedinfos;
1276	maptile *m;
1277		1059
1278	client &socket = *pl->contr->ns;
1279
1280	if (!pl->active)
1281	return;
1282
1283	check_map_change (pl->contr);	1060	check_map_change (pl);
1284	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;
1285		1096
1286	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1097	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1287	packet esl;	1098	packet esl;
1288		1099
1289	startlen = sl.length ();	1100	startlen = sl.length ();
…		…
1313	ay = 0;	1124	ay = 0;
1314		1125
1315	/* We could do this logic as conditionals in the if statement,	1126	/* We could do this logic as conditionals in the if statement,
1316	* but that started to get a bit messy to look at.	1127	* but that started to get a bit messy to look at.
1317	*/	1128	*/
1318	max_x = pl->x + (socket.mapx + 1) / 2;	1129	max_x = ob->x + (socket.mapx + 1) / 2;
1319	max_y = pl->y + (socket.mapy + 1) / 2;	1130	max_y = ob->y + (socket.mapy + 1) / 2;
1320		1131
1321	maptile *plmap = pl->map;
1322
1323	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++)
1324	{	1133	{
		1134	sint16 nx, ny;
		1135	maptile *m = 0;
		1136
1325	ax = 0;	1137	ax = 0;
1326	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++)
1327	{	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
1328	int emask, mask;	1155	int emask, mask;
1329	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1156	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1330		1157
1331	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1158	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1332		1159
1333	/* 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,
1334	* we tell the client as such	1161	* we tell the client as such
1335	*/	1162	*/
1336	nx = x;
1337	ny = y;
1338	m = get_map_from_coord (plmap, &nx, &ny);
1339
1340	if (!m)	1163	if (!m)
1341	{	1164	{
1342	/* space is out of map. Update space and clear values	1165	/* space is out of map. Update space and clear values
1343	* 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
1344	* of the map, it shouldn't have a head	1167	* of the map, it shouldn't have a head
…		…
1350	}	1173	}
1351		1174
1352	continue;	1175	continue;
1353	}	1176	}
1354		1177
1355	m->touch ();
1356
1357	int d = pl->contr->blocked_los[ax][ay];	1178	int d = pl->blocked_los[ax][ay];
1358		1179
1359	if (d > 3)	1180	if (d > 3)
1360	{	1181	{
1361
1362	int need_send = 0, count;	1182	int need_send = 0, count;
1363		1183
1364	/* This block deals with spaces that are not visible for whatever	1184	/* This block deals with spaces that are not visible for whatever
1365	* reason. Still may need to send the head for this space.	1185	* reason. Still may need to send the head for this space.
1366	*/	1186	*/
…		…
1372	if (lastcell.count != -1)	1192	if (lastcell.count != -1)
1373	need_send = 1;	1193	need_send = 1;
1374		1194
1375	count = -1;	1195	count = -1;
1376		1196
1377	/* properly clear a previously sent big face */
1378	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]	1197	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1379	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1198	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1380	need_send = 1;	1199	need_send = 1;
1381		1200
		1201	/* properly clear a previously sent big face */
1382	map_clearcell (&lastcell, count);	1202	map_clearcell (&lastcell, count);
1383		1203
1384	if ((mask & 0xf) || need_send)	1204	if ((mask & 0xf) || need_send)
1385	sl[oldlen + 1] = mask & 0xff;	1205	sl[oldlen + 1] = mask & 0xff;
1386	else	1206	else
…		…
1425	}	1245	}
1426		1246
1427	lastcell.count = d;	1247	lastcell.count = d;
1428		1248
1429	mapspace &ms = m->at (nx, ny);	1249	mapspace &ms = m->at (nx, ny);
		1250	ms.update ();
1430		1251
1431	if (socket.extmap)	1252	if (socket.extmap)
1432	{	1253	{
1433	uint8 stat_hp = 0;	1254	uint8 stat_hp = 0;
1434	uint8 stat_width = 0;	1255	uint8 stat_width = 0;
1435	uint8 flags = 0;	1256	uint8 flags = 0;
1436	UUID player = 0;	1257	tag_t player = 0;
1437		1258
1438	// send hp information, if applicable	1259	// send hp information, if applicable
1439	if (object *op = ms.faces_obj [0])	1260	if (object *op = ms.faces_obj [0])
		1261	if (op->is_head () && !op->invisible)
1440	{	1262	{
1441	if (op->head || op->invisible)	1263	if (op->stats.maxhp > op->stats.hp
1442	; // do not show	1264	&& op->stats.maxhp > 0
1443	else if (op->type == PLAYER	1265	&& (op->type == PLAYER
		1266	|| op->type == DOOR // does not work, have maxhp 0
1444	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1267	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1445	{
1446	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1447	{	1268	{
1448	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1269	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1449	stat_width = op->arch->tail_x;	1270	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1450	}	1271	}
1451	}
1452		1272
1453	if (op->msg && op->msg[0] == '@')	1273	if (op->has_dialogue ())
1454	flags |= 1;	1274	flags |= 1;
1455		1275
1456	if (op->type == PLAYER && op != pl)	1276	if (op->type == PLAYER)
1457	player = op->count;	1277	player = op->count;
1458	}	1278	}
1459		1279
1460	if (lastcell.stat_hp != stat_hp)	1280	if (lastcell.stat_hp != stat_hp)
1461	{	1281	{
1462	lastcell.stat_hp = stat_hp;	1282	lastcell.stat_hp = stat_hp;
1463		1283
…		…
1482		1302
1483	mask |= 0x8;	1303	mask |= 0x8;
1484	*last_ext |= 0x80;	1304	*last_ext |= 0x80;
1485	last_ext = &sl[sl.length ()];	1305	last_ext = &sl[sl.length ()];
1486		1306
1487	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1307	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1488	}	1308	}
1489		1309
1490	if (lastcell.flags != flags)	1310	if (lastcell.flags != flags)
1491	{	1311	{
1492	lastcell.flags = flags;	1312	lastcell.flags = flags;
…		…
1505		1325
1506	/* Middle face */	1326	/* Middle face */
1507	if (update_space (sl, socket, ms, lastcell, 1))	1327	if (update_space (sl, socket, ms, lastcell, 1))
1508	mask |= 0x2;	1328	mask |= 0x2;
1509		1329
1510	if (ms.player () == pl	1330	if (ms.player () == ob
1511	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))	1331	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1512	{	1332	{
1513	// force player to be visible to himself if invisible	1333	// force player to be visible to himself if invisible
1514	if (lastcell.faces[0] != pl->face)	1334	if (lastcell.faces[0] != ob->face)
1515	{	1335	{
1516	lastcell.faces[0] = pl->face;	1336	lastcell.faces[0] = ob->face;
1517		1337
1518	mask |= 0x1;	1338	mask |= 0x1;
1519	sl << uint16 (pl->face);	1339	sl << uint16 (ob->face);
1520		1340
1521	socket.send_faces (pl);	1341	socket.send_faces (ob);
1522	}	1342	}
1523	}	1343	}
1524	/* Top face */	1344	/* Top face */
1525	else if (update_space (sl, socket, ms, lastcell, 0))	1345	else if (update_space (sl, socket, ms, lastcell, 0))
1526	mask |= 0x1;	1346	mask |= 0x1;
1527
1528		1347
1529	/* Check to see if we are in fact sending anything for this	1348	/* Check to see if we are in fact sending anything for this
1530	* space by checking the mask. If so, update the mask.	1349	* space by checking the mask. If so, update the mask.
1531	* if not, reset the len to that from before adding the mask	1350	* if not, reset the len to that from before adding the mask
1532	* value, so we don't send those bits.	1351	* value, so we don't send those bits.
…		…
1566	}	1385	}
1567	} /* else this is a viewable space */	1386	} /* else this is a viewable space */
1568	} /* for x loop */	1387	} /* for x loop */
1569	} /* for y loop */	1388	} /* for y loop */
1570		1389
		1390	socket.flush_fx ();
		1391
1571	/* Verify that we in fact do need to send this */	1392	/* Verify that we in fact do need to send this */
1572	if (socket.ext_mapinfos)	1393	if (socket.ext_mapinfos)
1573	{	1394	{
1574	if (!(sl.length () > startlen || socket.sent_scroll))	1395	if (!(sl.length () > startlen || socket.sent_scroll))
1575	{	1396	{
…		…
1589	socket.send_packet (sl);	1410	socket.send_packet (sl);
1590	socket.sent_scroll = 0;	1411	socket.sent_scroll = 0;
1591	}	1412	}
1592	}	1413	}
1593		1414
1594	/**
1595	* Draws client map.
1596	*/
1597	void
1598	draw_client_map (object *pl)
1599	{
1600	int i, j;
1601	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1602	int mflags;
1603	struct Map newmap;
1604	maptile *m, *pm;
1605
1606	if (pl->type != PLAYER)
1607	{
1608	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1609	return;
1610	}
1611
1612	pm = pl->map;
1613
1614	/* If player is just joining the game, he isn't here yet, so the map
1615	* can get swapped out. If so, don't try to send them a map. All will
1616	* be OK once they really log in.
1617	*/
1618	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1619	return;
1620
1621	memset (&newmap, 0, sizeof (struct Map));
1622
1623	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1624	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1625	{
1626	ax = i;
1627	ay = j;
1628	m = pm;
1629	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1630
1631	if (mflags & P_OUT_OF_MAP)
1632	continue;
1633
1634	/* If a map is visible to the player, we don't want to swap it out
1635	* just to reload it. This should really call something like
1636	* swap_map, but this is much more efficient and 'good enough'
1637	*/
1638	if (mflags & P_NEW_MAP)
1639	m->timeout = 50;
1640	}
1641
1642	/* do LOS after calls to update_position */
1643	if (pl->contr->do_los)
1644	{
1645	update_los (pl);
1646	pl->contr->do_los = 0;
1647	}
1648
1649	/* Big maps need a different drawing mechanism to work */
1650	draw_client_map1 (pl);
1651	}
1652
1653
1654	/*****************************************************************************/	1415	/*****************************************************************************/
1655
1656	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1416	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1657
1658	/* a player. Of course, the client need to know the command to be able to */	1417	/* a player. Of course, the client need to know the command to be able to */
1659
1660	/* manage it ! */	1418	/* manage it ! */
1661
1662	/*****************************************************************************/	1419	/*****************************************************************************/
1663	void	1420	void
1664	send_plugin_custom_message (object *pl, char *buf)	1421	send_plugin_custom_message (object *pl, char *buf)
1665	{	1422	{
1666	pl->contr->ns->send_packet (buf);	1423	pl->contr->ns->send_packet (buf);
…		…
1677	sl << "replyinfo skill_info\n";	1434	sl << "replyinfo skill_info\n";
1678		1435
1679	for (int i = 1; i < NUM_SKILLS; i++)	1436	for (int i = 1; i < NUM_SKILLS; i++)
1680	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1437	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1681		1438
1682	if (sl.length () >= MAXSOCKBUF)	1439	if (sl.length () > MAXSOCKBUF)
1683	{	1440	{
1684	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1441	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1685	fatal (0);	1442	fatal (0);
1686	}	1443	}
1687		1444
…		…
1700	sl << "replyinfo spell_paths\n";	1457	sl << "replyinfo spell_paths\n";
1701		1458
1702	for (int i = 0; i < NRSPELLPATHS; i++)	1459	for (int i = 0; i < NRSPELLPATHS; i++)
1703	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1460	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1704		1461
1705	if (sl.length () >= MAXSOCKBUF)	1462	if (sl.length () > MAXSOCKBUF)
1706	{	1463	{
1707	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1464	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1708	fatal (0);	1465	fatal (0);
1709	}	1466	}
1710		1467
…		…
1729	if (spell->type == SPELL)	1486	if (spell->type == SPELL)
1730	{	1487	{
1731	int flags = 0;	1488	int flags = 0;
1732		1489
1733	/* check if we need to update it */	1490	/* check if we need to update it */
1734	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1491	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1735	{	1492	{
1736	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1493	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1737	flags |= UPD_SP_MANA;	1494	flags |= UPD_SP_MANA;
1738	}	1495	}
1739		1496
1740	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1497	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1741	{	1498	{
1742	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1499	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1743	flags |= UPD_SP_GRACE;	1500	flags |= UPD_SP_GRACE;
1744	}	1501	}
1745		1502
1746	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1503	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1747	{	1504	{
1748	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1505	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1749	flags |= UPD_SP_DAMAGE;	1506	flags |= UPD_SP_DAMAGE;
1750	}	1507	}
1751		1508
1752	if (flags)	1509	if (flags)
1753	{	1510	{
…		…
1755		1512
1756	sl << "updspell "	1513	sl << "updspell "
1757	<< uint8 (flags)	1514	<< uint8 (flags)
1758	<< uint32 (spell->count);	1515	<< uint32 (spell->count);
1759		1516
1760	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1517	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1761	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1518	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1762	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1519	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1763		1520
1764	pl->ns->send_packet (sl);	1521	pl->ns->send_packet (sl);
1765	}	1522	}
1766	}	1523	}
1767	}	1524	}
…		…
1797	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1554	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1798	return;	1555	return;
1799	}	1556	}
1800		1557
1801	/* store costs and damage in the object struct, to compare to later */	1558	/* store costs and damage in the object struct, to compare to later */
1802	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1559	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1803	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1560	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1804	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1561	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1805		1562
1806	/* figure out which skill it uses, if it uses one */	1563	/* figure out which skill it uses, if it uses one */
1807	if (spell->skill)	1564	if (spell->skill)
1808	{	1565	{
1809	for (i = 1; i < NUM_SKILLS; i++)	1566	for (i = 1; i < NUM_SKILLS; i++)
…		…
1819	{	1576	{
1820	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1577	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1821	spell->face = face_find ("burnout.x11", blank_face);	1578	spell->face = face_find ("burnout.x11", blank_face);
1822	}	1579	}
1823		1580
		1581	pl->ns->send_face (spell->face);
		1582
1824	/* send the current values */	1583	/* send the current values */
1825	sl << uint32 (spell->count)	1584	sl << uint32 (spell->count)
1826	<< uint16 (spell->level)	1585	<< uint16 (spell->level)
1827	<< uint16 (spell->casting_time)	1586	<< uint16 (spell->casting_time)
1828	<< uint16 (spell->last_sp)	1587	<< uint16 (spell->cached_sp)
1829	<< uint16 (spell->last_grace)	1588	<< uint16 (spell->cached_grace)
1830	<< uint16 (spell->last_eat)	1589	<< uint16 (spell->cached_eat)
1831	<< uint8 (skill)	1590	<< uint8 (skill)
1832	<< uint32 (spell->path_attuned)	1591	<< uint32 (spell->path_attuned)
1833	<< uint32 (spell->face)	1592	<< uint32 (spell->face)
1834	<< data8 (spell->name)	1593	<< data8 (spell->name)
1835	<< data16 (spell->msg);	1594	<< data16 (spell->msg);
…		…
1863	* bytes and 3 strings (because that is the spec) so we need to	1622	* bytes and 3 strings (because that is the spec) so we need to
1864	* check that the length of those 3 strings, plus the 23 bytes,	1623	* check that the length of those 3 strings, plus the 23 bytes,
1865	* won't take us over the length limit for the socket, if it does,	1624	* won't take us over the length limit for the socket, if it does,
1866	* we need to send what we already have, and restart packet formation	1625	* we need to send what we already have, and restart packet formation
1867	*/	1626	*/
		1627	if (spell->type != SPELL)
		1628	continue;
		1629
1868	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1630	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1869	* to show add_spell is 26 bytes + 2 strings. However, the overun	1631	* to show add_spell is 26 bytes + 2 strings. However, the overun
1870	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1632	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1871	* like it will fix this	1633	* like it will fix this
1872	*/	1634	*/
1873	if (spell->type != SPELL)
1874	continue;
1875
1876	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1635	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1877	{	1636	{
		1637	pl->ns->flush_fx ();
1878	pl->ns->send_packet (sl);	1638	pl->ns->send_packet (sl);
1879		1639
1880	sl.reset ();	1640	sl.reset ();
1881	sl << "addspell ";	1641	sl << "addspell ";
1882	}	1642	}
…		…
1890	return;	1650	return;
1891	}	1651	}
1892	else	1652	else
1893	append_spell (pl, sl, spell);	1653	append_spell (pl, sl, spell);
1894		1654
1895	if (sl.length () >= MAXSOCKBUF)	1655	if (sl.length () > MAXSOCKBUF)
1896	{	1656	{
1897	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1657	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1898	fatal (0);	1658	fatal (0);
1899	}	1659	}
1900		1660
1901	/* finally, we can send the packet */	1661	/* finally, we can send the packet */
		1662	pl->ns->flush_fx ();
1902	pl->ns->send_packet (sl);	1663	pl->ns->send_packet (sl);
1903	}	1664	}
1904		1665

Diff Legend

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