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.78 by root, Thu Mar 15 14:59:43 2007 UTC vs.
Revision 1.132 by elmex, Sun Jun 15 19:34:31 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/**	24	/**
26	* \file	25	* \file
27	* Client handling.	26	* Client handling.
…		…
130	}	129	}
131		130
132	static void	131	static void
133	clear_map (player *pl)	132	clear_map (player *pl)
134	{	133	{
		134	pl->ns->mapinfo_queue_clear ();
		135
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	136	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
		137
		138	pl->ns->force_newmap = false;
136		139
137	if (pl->ns->newmapcmd == 1)	140	if (pl->ns->newmapcmd == 1)
138	pl->ns->send_packet ("newmap");	141	pl->ns->send_packet ("newmap");
139		142
140	pl->ns->floorbox_reset ();	143	pl->ns->floorbox_reset ();
		144	}
		145
		146	static void
		147	send_map_info (player *pl)
		148	{
		149	client &socket = *pl->ns;
		150	object *ob = pl->observe;
		151
		152	if (socket.mapinfocmd)
		153	{
		154	if (ob->map && ob->map->path[0])
		155	{
		156	int flags = 0;
		157
		158	if (ob->map->tile_path[0]) flags |= 1;
		159	if (ob->map->tile_path[1]) flags |= 2;
		160	if (ob->map->tile_path[2]) flags |= 4;
		161	if (ob->map->tile_path[3]) flags |= 8;
		162
		163	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		164	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		165	ob->map->width, ob->map->height, &ob->map->path);
		166	}
		167	else
		168	socket.send_packet ("mapinfo current");
		169	}
141	}	170	}
142		171
143	/** check for map/region change and send new map data */	172	/** check for map/region change and send new map data */
144	static void	173	static void
145	check_map_change (player *pl)	174	check_map_change (player *pl)
146	{	175	{
147	client &socket = *pl->ns;	176	client &socket = *pl->ns;
148	object *ob = pl->ob;	177	object *ob = pl->observe;
149	char buf[MAX_BUF]; /* eauugggh */
150		178
151	if (socket.current_map != ob->map)	179	region *reg = ob->region ();
		180	if (socket.current_region != reg)
		181	{
		182	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		183	socket.current_region = reg;
152	{	184	}
		185
		186	// first try to aovid a full newmap on tiled map scrolls
		187	if (socket.current_map != ob->map && !socket.force_newmap)
		188	{
		189	rv_vector rv;
		190
		191	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		192
		193	// manhattan distance is very handy here
		194	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		195	{
		196	socket.current_map = ob->map;
		197	socket.current_x = ob->x;
		198	socket.current_y = ob->y;
		199
		200	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		201	socket.floorbox_reset ();
		202	send_map_info (pl);
		203	}
		204	}
		205
		206	if (socket.current_map != ob->map || socket.force_newmap)
		207	{
		208	clear_map (pl);
153	socket.current_map = ob->map;	209	socket.current_map = ob->map;
154		210	send_map_info (pl);
155	clear_map (pl);
156
157	if (socket.mapinfocmd)
158	{
159	if (ob->map && ob->map->path[0])
160	{
161	int flags = 0;
162
163	if (ob->map->tile_path[0])
164	flags |= 1;
165	if (ob->map->tile_path[1])
166	flags |= 2;
167	if (ob->map->tile_path[2])
168	flags |= 4;
169	if (ob->map->tile_path[3])
170	flags |= 8;
171
172	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
173	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
174	}
175	else
176	snprintf (buf, MAX_BUF, "mapinfo current");
177
178	socket.send_packet (buf);
179	}
180	}	211	}
181	else if (socket.current_x != ob->x || socket.current_y != ob->y)	212	else if (socket.current_x != ob->x || socket.current_y != ob->y)
182	{	213	{
183	int dx = ob->x - socket.current_x;	214	int dx = ob->x - socket.current_x;
184	int dy = ob->y - socket.current_y;	215	int dy = ob->y - socket.current_y;
…		…
192	}	223	}
193	}	224	}
194		225
195	socket.current_x = ob->x;	226	socket.current_x = ob->x;
196	socket.current_y = ob->y;	227	socket.current_y = ob->y;
197
198	region *reg = ob->region ();
199	if (socket.current_region != reg)
200	{
201	socket.current_region = reg;
202	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203	}
204	}	228	}
205		229
206	/**	230	/**
207	* RequestInfo is sort of a meta command. There is some specific	231	* RequestInfo is sort of a meta command. There is some specific
208	* request of information, but we call other functions to provide	232	* request of information, but we call other functions to provide
209	* that information.	233	* that information.
210	*/	234	*/
211	void	235	void
212	RequestInfo (char *buf, int len, client * ns)	236	RequestInfo (char *buf, int len, client *ns)
213	{	237	{
214	char *params = NULL, *cp;	238	char *params;
215
216	/* No match */
217	char bigbuf[MAX_BUF];
218	int slen;
219
220	/* Set up replyinfo before we modify any of the buffers - this is used
221	* if we don't find a match.
222	*/
223	strcpy (bigbuf, "replyinfo ");
224	slen = strlen (bigbuf);
225	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
226		239
227	/* find the first space, make it null, and update the	240	/* find the first space, make it null, and update the
228	* params pointer.	241	* params pointer.
229	*/	242	*/
230	for (cp = buf; *cp != '\0'; cp++)	243	for (params = buf; *params; params++)
231	if (*cp == ' ')	244	if (*params == ' ')
232	{	245	{
233	*cp = '\0';
234	params = cp + 1;	246	*params++ = 0;
235	break;	247	break;
236	}	248	}
237		249
238	if (!strcmp (buf, "image_info"))	250	if (!strcmp (buf, "image_info"))
239	send_image_info (ns, params);	251	send_image_info (ns, params);
…		…
242	else if (!strcmp (buf, "skill_info"))	254	else if (!strcmp (buf, "skill_info"))
243	send_skill_info (ns, params);	255	send_skill_info (ns, params);
244	else if (!strcmp (buf, "spell_paths"))	256	else if (!strcmp (buf, "spell_paths"))
245	send_spell_paths (ns, params);	257	send_spell_paths (ns, params);
246	else	258	else
247	ns->send_packet (bigbuf, len);	259	{
		260	// undo tokenisation above and send replyinfo with the request unchanged
		261	if (*params)
		262	*--params = ' ';
		263
		264	ns->send_packet_printf ("replyinfo %s", buf);
		265	}
248	}	266	}
249		267
250	void	268	void
251	ExtCmd (char *buf, int len, player *pl)	269	ExtCmd (char *buf, int len, player *pl)
252	{	270	{
…		…
255		273
256	void	274	void
257	ExtiCmd (char *buf, int len, client *ns)	275	ExtiCmd (char *buf, int len, client *ns)
258	{	276	{
259	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	277	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		278	}
		279
		280	void
		281	client::mapinfo_queue_clear ()
		282	{
		283	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		284	free (*i);
		285
		286	mapinfo_queue.clear ();
		287	}
		288
		289	bool
		290	client::mapinfo_try (char *buf)
		291	{
		292	char *token = buf;
		293	buf += strlen (buf) + 9;
		294
		295	// initial map and its origin
		296	maptile *map = pl->observe->map;
		297	int mapx = pl->ns->mapx / 2 - pl->observe->x;
		298	int mapy = pl->ns->mapy / 2 - pl->observe->y;
		299	int max_distance = 8; // limit maximum path length to something generous
		300
		301	while (*buf && map && max_distance)
		302	{
		303	int dir = *buf++ - '1';
		304
		305	if (dir >= 0 && dir <= 3)
		306	{
		307	if (!map->tile_path [dir])
		308	map = 0;
		309	else if (map->tile_available (dir, false))
		310	{
		311	maptile *neigh = map->tile_map [dir];
		312
		313	switch (dir)
		314	{
		315	case 0: mapy -= neigh->height; break;
		316	case 2: mapy += map ->height; break;
		317	case 3: mapx -= neigh->width ; break;
		318	case 1: mapx += map ->width ; break;
		319	}
		320
		321	map = neigh;
		322	--max_distance;
		323	}
		324	else
		325	return 0;
		326	}
		327	else
		328	max_distance = 0;
		329	}
		330
		331	if (!max_distance)
		332	send_packet_printf ("mapinfo %s error", token);
		333	else if (!map || !map->path)
		334	send_packet_printf ("mapinfo %s nomap", token);
		335	else
		336	{
		337	int flags = 0;
		338
		339	if (map->tile_path[0]) flags |= 1;
		340	if (map->tile_path[1]) flags |= 2;
		341	if (map->tile_path[2]) flags |= 4;
		342	if (map->tile_path[3]) flags |= 8;
		343
		344	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		345	}
		346
		347	return 1;
		348	}
		349
		350	void
		351	client::mapinfo_queue_run ()
		352	{
		353	if (mapinfo_queue.empty () || !pl)
		354	return;
		355
		356	for (int i = 0; i < mapinfo_queue.size (); ++i)
		357	if (mapinfo_try (mapinfo_queue [i]))
		358	{
		359	free (mapinfo_queue [i]);
		360	mapinfo_queue.erase (i);
		361	}
		362	else
		363	++i;
260	}	364	}
261		365
262	void	366	void
263	MapInfoCmd (char *buf, int len, player *pl)	367	MapInfoCmd (char *buf, int len, player *pl)
264	{	368	{
265	// <mapinfo tag spatial tile-path	369	// <mapinfo tag spatial tile-path
266	// >mapinfo tag spatial flags x y w h hash	370	// >mapinfo tag spatial flags x y w h hash
267		371
268	char bigbuf[MAX_BUF], *token;
269
270	token = buf;	372	char *token = buf;
271	// copy token	373
272	if (!(buf = strchr (buf, ' ')))	374	if (!(buf = strchr (buf, ' ')))
273	return;	375	return;
274		376
275	*buf++ = 0;
276
277	if (!strncmp (buf, "spatial ", 8))	377	if (!strncmp (buf, " spatial ", 9))
278	{	378	{
279	buf += 8;	379	char *copy = strdup (token);
		380	copy [buf - token] = 0;
280		381
281	// initial map and its origin	382	#if 0
282	maptile *map = pl->ob->map;	383	// this makes only sense when we flush the buffer immediately
283	sint16 dx, dy;	384	if (pl->ns->mapinfo_try (copy))
284	int mapx = pl->ns->mapx / 2 - pl->ob->x;	385	free (copy);
285	int mapy = pl->ns->mapy / 2 - pl->ob->y;
286	int max_distance = 8; // limit maximum path length to something generous
287
288	while (*buf && map && max_distance)
289	{
290	int dir = *buf++;
291
292	switch (dir)
293	{
294	case '1':
295	dx = 0;
296	dy = -1;
297	map = map->xy_find (dx, dy);
298	map && (mapy -= map->height);
299	break;
300	case '2':
301	mapx += map->width;
302	dx = map->width;
303	dy = 0;
304	map = map->xy_find (dx, dy);
305	break;
306	case '3':
307	mapy += map->height;
308	dx = 0;
309	dy = map->height;
310	map = map->xy_find (dx, dy);
311	break;
312	case '4':
313	dx = -1;
314	dy = 0;
315	map = map->xy_find (dx, dy);
316	map && (mapx -= map->width);
317	break;
318	}
319
320	--max_distance;
321	}
322
323	if (!max_distance)
324	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325	else if (map && map->path[0])
326	{
327	int flags = 0;
328
329	if (map->tile_path[0])
330	flags |= 1;
331	if (map->tile_path[1])
332	flags |= 2;
333	if (map->tile_path[2])
334	flags |= 4;
335	if (map->tile_path[3])
336	flags |= 8;
337
338	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339	}
340	else	386	else
341	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	387	#endif
		388	pl->ns->mapinfo_queue.push_back (copy);
342	}	389	}
343	else	390	else
344	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	391	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346	pl->ns->send_packet (bigbuf);
347	}	392	}
348		393
349	/** This is the Setup cmd - easy first implementation */	394	/** This is the Setup cmd */
350	void	395	void
351	SetUp (char *buf, int len, client * ns)	396	SetUp (char *buf, int len, client * ns)
352	{	397	{
353	int s, slen;	398	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354	char *cmd, *param, cmdback[HUGE_BUF];
355
356	/* run through the cmds of setup
357	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358	*
359	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360	* The client then must sort this out
361	*/
362
363	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365	strcpy (cmdback, "setup");
366	for (s = 0; s < len; )
367	{
368	cmd = &buf[s];
369
370	/* find the next space, and put a null there */
371	for (; buf[s] && buf[s] != ' '; s++)
372	;
373
374	buf[s++] = 0;
375
376	while (buf[s] == ' ')
377	s++;
378
379	if (s >= len)
380	break;
381
382	param = &buf[s];
383
384	for (; buf[s] && buf[s] != ' '; s++)
385	;
386
387	buf[s++] = 0;
388
389	while (buf[s] == ' ')
390	s++;
391
392	slen = strlen (cmdback);
393	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397	if (!strcmp (cmd, "sound"))
398	{
399	ns->sound = atoi (param);
400	safe_strcat (cmdback, param, &slen, HUGE_BUF);
401	}
402	else if (!strcmp (cmd, "exp64"))
403	safe_strcat (cmdback, param, &slen, HUGE_BUF);
404	else if (!strcmp (cmd, "spellmon"))
405	{
406	ns->monitor_spells = atoi (param);
407	safe_strcat (cmdback, param, &slen, HUGE_BUF);
408	}
409	else if (!strcmp (cmd, "darkness"))
410	{
411	ns->darkness = atoi (param);
412	safe_strcat (cmdback, param, &slen, HUGE_BUF);
413	}
414	else if (!strcmp (cmd, "map1cmd"))
415	{
416	if (atoi (param))
417	ns->mapmode = Map1Cmd;
418	/* if beyond this size, need to use map1cmd no matter what */
419	if (ns->mapx > 11 || ns->mapy > 11)
420	ns->mapmode = Map1Cmd;
421	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422	}
423	else if (!strcmp (cmd, "map1acmd"))
424	{
425	if (atoi (param))
426	ns->mapmode = Map1aCmd;
427	/* if beyond this size, need to use map1acmd no matter what */
428	if (ns->mapx > 11 || ns->mapy > 11)
429	ns->mapmode = Map1aCmd;
430	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431	}
432	else if (!strcmp (cmd, "newmapcmd"))
433	{
434	ns->newmapcmd = atoi (param);
435	safe_strcat (cmdback, param, &slen, HUGE_BUF);
436	}
437	else if (!strcmp (cmd, "mapinfocmd"))
438	{
439	ns->mapinfocmd = atoi (param);
440	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441	}
442	else if (!strcmp (cmd, "extcmd"))
443	{
444	ns->extcmd = atoi (param);
445	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446	}
447	else if (!strcmp (cmd, "extmap"))
448	{
449	ns->extmap = atoi (param);
450	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451	}
452	else if (!strcmp (cmd, "facecache"))
453	{
454	ns->facecache = atoi (param);
455	safe_strcat (cmdback, param, &slen, HUGE_BUF);
456	}
457	else if (!strcmp (cmd, "faceset"))
458	{
459	char tmpbuf[20];
460	int q = atoi (param);
461
462	if (is_valid_faceset (q))
463	ns->faceset = q;
464
465	sprintf (tmpbuf, "%d", ns->faceset);
466	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
467	/* if the client is using faceset, it knows about image2 command */
468	ns->image2 = 1;
469	}
470	else if (!strcmp (cmd, "itemcmd"))
471	{
472	/* Version of the item protocol command to use. Currently,
473	* only supported versions are 1 and 2. Using a numeric
474	* value will make it very easy to extend this in the future.
475	*/
476	char tmpbuf[20];
477	int q = atoi (param);
478
479	if (q < 1 || q > 2)
480	{
481	strcpy (tmpbuf, "FALSE");
482	}
483	else
484	{
485	ns->itemcmd = q;
486	sprintf (tmpbuf, "%d", ns->itemcmd);
487	}
488	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
489	}
490	else if (!strcmp (cmd, "mapsize"))
491	{
492	int x, y = 0;
493	char tmpbuf[MAX_BUF], *cp;
494
495	x = atoi (param);
496	for (cp = param; *cp != 0; cp++)
497	if (*cp == 'x' || *cp == 'X')
498	{
499	y = atoi (cp + 1);
500	break;
501	}
502
503	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
504	{
505	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
506	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
507	}
508	else
509	{
510	ns->mapx = x;
511	ns->mapy = y;
512	/* better to send back what we are really using and not the
513	* param as given to us in case it gets parsed differently.
514	*/
515	sprintf (tmpbuf, "%dx%d", x, y);
516	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
517	/* If beyond this size and still using orig map command, need to
518	* go to map1cmd.
519	*/
520	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
521	ns->mapmode = Map1Cmd;
522	}
523	}
524	else if (!strcmp (cmd, "extendedMapInfos"))
525	{
526	/* Added by tchize
527	* prepare to use the mapextended command
528	*/
529	char tmpbuf[20];
530
531	ns->ext_mapinfos = (atoi (param));
532	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
533	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
534	}
535	else if (!strcmp (cmd, "extendedTextInfos"))
536	{
537	/* Added by tchize
538	* prepare to use the extended text commands
539	* Client toggle this to non zero to get exttext
540	*/
541	char tmpbuf[20];
542
543	ns->has_readable_type = (atoi (param));
544	sprintf (tmpbuf, "%d", ns->has_readable_type);
545	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
546	}
547	else
548	{
549	/* Didn't get a setup command we understood -
550	* report a failure to the client.
551	*/
552	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
553	}
554	} /* for processing all the setup commands */
555
556	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
557	ns->send_packet (cmdback);
558	}	399	}
559		400
560	/**	401	/**
561	* The client has requested to be added to the game.	402	* The client has requested to be added to the game.
562	* 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.
…		…
564	* 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.
565	*/	406	*/
566	void	407	void
567	AddMeCmd (char *buf, int len, client *ns)	408	AddMeCmd (char *buf, int len, client *ns)
568	{	409	{
569	// face caching is mandatory
570	if (!ns->facecache)
571	{
572	ns->send_drawinfo (
573	"\n"
574	"\n"
575	"***\n"
576	"*** WARNING:\n"
577	"*** Your client does not support face/image caching,\n"
578	"*** or it has been disabled. Face caching is mandatory\n"
579	"*** so please enable it or use a newer client.\n"
580	"***\n"
581	"*** Look at your client preferences:\n"
582	"***\n"
583	"*** CFPlus: all known versions automatically enable the facecache.\n"
584	"*** cfclient: use the -cache commandline option.\n"
585	"*** cfclient: map will not redraw automatically (bug).\n"
586	"*** gcfclient: use -cache commandline option, or enable\n"
587	"*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
588	"*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
589	"***\n"
590	"***\n",
591	NDI_RED
592	);
593
594	if (strstr (ns->version, "jcrossclient"))
595	/* let them, for now*/;
596	else
597	{
598	ns->flush ();
599	//ns->destroy ();
600	}
601	//ns->facecache = true;
602	}
603
604	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
605	}	411	}
606		412
607	/** Reply to ExtendedInfos command */	413	/** Reply to ExtendedInfos command */
608	void	414	void
…		…
719		525
720	ns->send_packet (cmdback);	526	ns->send_packet (cmdback);
721	}	527	}
722		528
723	/**	529	/**
724	* client requested an image. send it rate-limited
725	* before flushing.
726	*/
727	void
728	AskFaceCmd (char *buf, int len, client *ns)
729	{
730	ns->askface.push_back (atoi (buf));
731	}
732
733	/**
734	* Tells client the picture it has to use
735	* to smooth a picture number given as argument.
736	*/
737	void
738	AskSmooth (char *buf, int len, client *ns)
739	{
740	ns->send_face (atoi (buf));
741	}
742
743	/**
744	* 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,
745	* etc.)	531	* etc.)
746	*/	532	*/
747	void	533	void
748	PlayerCmd (char *buf, int len, player *pl)	534	PlayerCmd (char *buf, int len, player *pl)
…		…
769	* commands.	555	* commands.
770	*/	556	*/
771	pl->count = 0;	557	pl->count = 0;
772	}	558	}
773		559
774
775	/**	560	/**
776	* 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,
777	* 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
778	* '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
779	* can throttle.	564	* can throttle.
…		…
781	void	566	void
782	NewPlayerCmd (char *buf, int len, player *pl)	567	NewPlayerCmd (char *buf, int len, player *pl)
783	{	568	{
784	if (len <= 6)	569	if (len <= 6)
785	{	570	{
786	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);
787	return;	572	return;
788	}	573	}
789		574
790	uint16 cmdid = net_uint16 ((uint8 *)buf);	575	uint16 cmdid = net_uint16 ((uint8 *)buf);
791	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	576	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
848	{	633	{
849	case ST_PLAYING:	634	case ST_PLAYING:
850	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	635	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
851	break;	636	break;
852		637
853	case ST_CHANGE_CLASS:
854	key_change_class (pl->ob, buf[0]);
855	break;
856
857	case ST_GET_PARTY_PASSWORD: /* Get password for party */	638	case ST_GET_PARTY_PASSWORD: /* Get password for party */
858	receive_party_password (pl->ob, 13);	639	receive_party_password (pl->ob, 13);
859	break;	640	break;
860		641
861	default:	642	default:
…		…
900		681
901	cp = strchr (cp + 1, ' ');	682	cp = strchr (cp + 1, ' ');
902		683
903	if (cp)	684	if (cp)
904	{	685	{
905	assign (ns->version, cp + 1);	686	ns->version = cp + 1;
906		687
907	if (ns->sc_version < 1026)	688	if (ns->sc_version < 1026)
908	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	689	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
909	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	690	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
910	}	691	}
…		…
933	* syntax is: move (to) (tag) (nrof)	714	* syntax is: move (to) (tag) (nrof)
934	*/	715	*/
935	void	716	void
936	MoveCmd (char *buf, int len, player *pl)	717	MoveCmd (char *buf, int len, player *pl)
937	{	718	{
938	int vals[3], i;	719	int to, tag, nrof;
939		720
940	/* A little funky here. We only cycle for 2 records, because	721	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
941	* we obviously are not going to find a space after the third
942	* record. Perhaps we should just replace this with a
943	* sscanf?
944	*/
945	for (i = 0; i < 2; i++)
946	{	722	{
947	vals[i] = atoi (buf);
948
949	if (!(buf = strchr (buf, ' ')))
950	{
951	LOG (llevError, "Incomplete move command: %s\n", buf);	723	LOG (llevError, "Incomplete move command: %s\n", buf);
952	return;	724	return;
953	}
954
955	buf++;
956	}	725	}
957		726
958	vals[2] = atoi (buf);	727	esrv_move_object (pl->ob, to, tag, nrof);
959
960	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
961	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
962	}	728	}
963		729
964	/******************************************************************************	730	/******************************************************************************
965	*	731	*
966	* Start of commands the server sends to the client.	732	* Start of commands the server sends to the client.
…		…
970	/**	736	/**
971	* 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
972	* 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)
973	*/	739	*/
974	void	740	void
975	send_query (client *ns, uint8 flags, char *text)	741	send_query (client *ns, uint8 flags, const char *text)
976	{	742	{
977	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);
978	}	772	}
979		773
980	#define AddIfInt64(Old,New,Type) if (Old != New) {\	774	#define AddIfInt64(Old,New,Type) if (Old != New) {\
981	Old = New; \	775	Old = New; \
982	sl << uint8 (Type) << uint64 (New); \	776	sl << uint8 (Type) << uint64 (New); \
…		…
990	#define AddIfShort(Old,New,Type) if (Old != New) {\	784	#define AddIfShort(Old,New,Type) if (Old != New) {\
991	Old = New; \	785	Old = New; \
992	sl << uint8 (Type) << uint16 (New); \	786	sl << uint8 (Type) << uint16 (New); \
993	}	787	}
994		788
995	#define AddIfFloat(Old,New,Type) if (Old != New) {\	789	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
996	Old = New; \	790	Old = New; \
997	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	791	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
998	}	792	}
999		793
1000	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	794	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1001	free(Old); Old = strdup (New);\	795	free(Old); Old = strdup (New);\
1002	sl << uint8 (Type) << data8 (New); \	796	sl << uint8 (Type) << data8 (New); \
…		…
1016		810
1017	client *ns = pl->ns;	811	client *ns = pl->ns;
1018	if (!ns)	812	if (!ns)
1019	return;	813	return;
1020		814
1021	object *ob = pl->ob;	815	object *ob = pl->observe;
1022	if (!ob)	816	if (!ob)
1023	return;	817	return;
		818
		819	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1024		820
1025	packet sl ("stats");	821	packet sl ("stats");
1026		822
1027	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	823	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1028	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	824	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
1037	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	833	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1038	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	834	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1039	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	835	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1040		836
1041	for (int s = 0; s < NUM_SKILLS; s++)	837	for (int s = 0; s < NUM_SKILLS; s++)
1042	if (object *skill = pl->last_skill_ob[s])	838	if (object *skill = opl->last_skill_ob[s])
1043	if (skill->stats.exp != ns->last_skill_exp [s])	839	if (skill->stats.exp != ns->last_skill_exp [s])
1044	{	840	{
1045	ns->last_skill_exp [s] = skill->stats.exp;	841	ns->last_skill_exp [s] = skill->stats.exp;
1046		842
1047	/* Always send along the level if exp changes. This is only	843	/* Always send along the level if exp changes. This is only
…		…
1055	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	851	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1056	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	852	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1057	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	853	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1058	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	854	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1059	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	855	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1060	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	856	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1061	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	857	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1062	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);
1063	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);
1064		860
1065	flags = 0;	861	flags = 0;
1066		862
1067	if (pl->fire_on)	863	if (opl->fire_on)
1068	flags |= SF_FIREON;	864	flags |= SF_FIREON;
1069		865
1070	if (pl->run_on)	866	if (opl->run_on)
1071	flags |= SF_RUNON;	867	flags |= SF_RUNON;
1072		868
1073	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	869	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1074		870
1075	if (ns->sc_version < 1025)	871	if (ns->sc_version < 1025)
…		…
1089	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);
1090	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);
1091	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);
1092	}	888	}
1093		889
1094	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 */
1095	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	891	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1096	set_title (ob, buf);	892	set_title (ob, buf);
1097	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	893	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1098		894
1099	/* Only send it away if we have some actual data */	895	/* Only send it away if we have some actual data */
…		…
1103		899
1104	/**	900	/**
1105	* 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.
1106	*/	902	*/
1107	void	903	void
1108	esrv_new_player (player *pl, uint32 weight)	904	esrv_new_player (player *pl)
1109	{	905	{
		906	sint32 weight = pl->ob->client_weight ();
		907
1110	packet sl ("player");	908	packet sl ("player");
1111		909
1112	sl << uint32 (pl->ob->count)	910	sl << uint32 (pl->ob->count)
1113	<< uint32 (weight)	911	<< uint32 (weight)
1114	<< uint32 (pl->ob->face)	912	<< uint32 (pl->ob->face)
…		…
1181		979
1182	if (!ns.faces_sent[face_num])	980	if (!ns.faces_sent[face_num])
1183	if (ob)	981	if (ob)
1184	ns.send_faces (ob);	982	ns.send_faces (ob);
1185	else	983	else
1186	ns.send_face (face_num);	984	ns.send_face (face_num, 10);
1187		985
1188	sl << uint16 (face_num);	986	sl << uint16 (face_num);
1189	return 1;	987	return 1;
1190	}	988	}
1191		989
…		…
1233	{	1031	{
1234	prefetch_surrounding_maps (op->map, 3);	1032	prefetch_surrounding_maps (op->map, 3);
1235	}	1033	}
1236		1034
1237	/**	1035	/**
1238	* This function uses the new map1 protocol command to send the map	1036	* Draws client map.
1239	* to the client. It is necessary because the old map command supports
1240	* a maximum map size of 15x15.
1241	* This function is much simpler than the old one. This is because
1242	* the old function optimized to send as few face identifiers as possible,
1243	* at the expense of sending more coordinate location (coordinates were
1244	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1245	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1246	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1247	* and use the other 4 bits for other informatiion. For full documentation
1248	* of what we send, see the doc/Protocol file.
1249	* I will describe internally what we do:
1250	* the ns->lastmap shows how the map last looked when sent to the client.
1251	* in the lastmap structure, there is a cells array, which is set to the
1252	* maximum viewable size (As set in config.h).
1253	* in the cells, there are faces and a count value.
1254	* we use the count value to hold the darkness value. If -1, then this space
1255	* is not viewable.
1256	* we use faces[0] faces[1] faces[2] to hold what the three layers
1257	* look like.
1258	*/	1037	*/
1259	void	1038	void
1260	draw_client_map1 (object *pl)	1039	draw_client_map (player *pl)
1261	{	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
1262	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	1054	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1263	sint16 nx, ny;
1264	int estartlen, eoldlen;	1055	int estartlen, eoldlen;
1265	uint8 eentrysize;	1056	uint8 eentrysize;
1266	uint16 ewhatstart, ewhatflag;	1057	uint16 ewhatstart, ewhatflag;
1267	uint8 extendedinfos;	1058	uint8 extendedinfos;
1268	maptile *m;
1269		1059
1270	client &socket = *pl->contr->ns;
1271
1272	if (!pl->active)
1273	return;
1274
1275	check_map_change (pl->contr);	1060	check_map_change (pl);
1276	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;
1277		1096
1278	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1097	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1279	packet esl;	1098	packet esl;
1280		1099
1281	startlen = sl.length ();	1100	startlen = sl.length ();
…		…
1305	ay = 0;	1124	ay = 0;
1306		1125
1307	/* We could do this logic as conditionals in the if statement,	1126	/* We could do this logic as conditionals in the if statement,
1308	* but that started to get a bit messy to look at.	1127	* but that started to get a bit messy to look at.
1309	*/	1128	*/
1310	max_x = pl->x + (socket.mapx + 1) / 2;	1129	max_x = ob->x + (socket.mapx + 1) / 2;
1311	max_y = pl->y + (socket.mapy + 1) / 2;	1130	max_y = ob->y + (socket.mapy + 1) / 2;
1312		1131
1313	maptile *plmap = pl->map;
1314
1315	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++)
1316	{	1133	{
		1134	sint16 nx, ny;
		1135	maptile *m = 0;
		1136
1317	ax = 0;	1137	ax = 0;
1318	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++)
1319	{	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
1320	int emask, mask;	1155	int emask, mask;
1321	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1156	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1322		1157
1323	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1158	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1324		1159
1325	/* 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,
1326	* we tell the client as such	1161	* we tell the client as such
1327	*/	1162	*/
1328	nx = x;
1329	ny = y;
1330	m = get_map_from_coord (plmap, &nx, &ny);
1331
1332	if (!m)	1163	if (!m)
1333	{	1164	{
1334	/* space is out of map. Update space and clear values	1165	/* space is out of map. Update space and clear values
1335	* 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
1336	* of the map, it shouldn't have a head	1167	* of the map, it shouldn't have a head
…		…
1342	}	1173	}
1343		1174
1344	continue;	1175	continue;
1345	}	1176	}
1346		1177
1347	m->touch ();
1348
1349	int d = pl->contr->blocked_los[ax][ay];	1178	int d = pl->blocked_los[ax][ay];
1350		1179
1351	if (d > 3)	1180	if (d > 3)
1352	{	1181	{
1353		1182
1354	int need_send = 0, count;	1183	int need_send = 0, count;
…		…
1417	}	1246	}
1418		1247
1419	lastcell.count = d;	1248	lastcell.count = d;
1420		1249
1421	mapspace &ms = m->at (nx, ny);	1250	mapspace &ms = m->at (nx, ny);
		1251	ms.update ();
1422		1252
1423	if (socket.extmap)	1253	if (socket.extmap)
1424	{	1254	{
1425	uint8 stat_hp = 0;	1255	uint8 stat_hp = 0;
1426	uint8 stat_width = 0;	1256	uint8 stat_width = 0;
1427	uint8 flags = 0;	1257	uint8 flags = 0;
1428	UUID player = 0;	1258	tag_t player = 0;
1429		1259
1430	// send hp information, if applicable	1260	// send hp information, if applicable
1431	if (object *op = ms.faces_obj [0])	1261	if (object *op = ms.faces_obj [0])
		1262	if (op->is_head () && !op->invisible)
1432	{	1263	{
1433	if (op->head || op->invisible)	1264	if (op->stats.maxhp > op->stats.hp
1434	; // do not show	1265	&& op->stats.maxhp > 0
1435	else if (op->type == PLAYER	1266	&& (op->type == PLAYER
		1267	|| op->type == DOOR // does not work, have maxhp 0
1436	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1268	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1437	{
1438	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1439	{	1269	{
1440	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1270	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1441	stat_width = op->arch->tail_x;	1271	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1442	}	1272	}
1443	}
1444		1273
1445	if (op->msg && op->msg[0] == '@')	1274	if (op->msg && op->msg[0] == '@')
1446	flags |= 1;	1275	flags |= 1;
1447		1276
1448	if (op->type == PLAYER && op != pl)	1277	if (op->type == PLAYER && op != ob)
1449	player = op->count;	1278	player = op->count;
1450	}	1279	}
1451		1280
1452	if (lastcell.stat_hp != stat_hp)	1281	if (lastcell.stat_hp != stat_hp)
1453	{	1282	{
1454	lastcell.stat_hp = stat_hp;	1283	lastcell.stat_hp = stat_hp;
1455		1284
…		…
1474		1303
1475	mask |= 0x8;	1304	mask |= 0x8;
1476	*last_ext |= 0x80;	1305	*last_ext |= 0x80;
1477	last_ext = &sl[sl.length ()];	1306	last_ext = &sl[sl.length ()];
1478		1307
1479	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1308	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1480	}	1309	}
1481		1310
1482	if (lastcell.flags != flags)	1311	if (lastcell.flags != flags)
1483	{	1312	{
1484	lastcell.flags = flags;	1313	lastcell.flags = flags;
…		…
1497		1326
1498	/* Middle face */	1327	/* Middle face */
1499	if (update_space (sl, socket, ms, lastcell, 1))	1328	if (update_space (sl, socket, ms, lastcell, 1))
1500	mask |= 0x2;	1329	mask |= 0x2;
1501		1330
1502	if (ms.player () == pl	1331	if (ms.player () == ob
1503	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))	1332	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1504	{	1333	{
1505	// force player to be visible to himself if invisible	1334	// force player to be visible to himself if invisible
1506	if (lastcell.faces[0] != pl->face)	1335	if (lastcell.faces[0] != ob->face)
1507	{	1336	{
1508	lastcell.faces[0] = pl->face;	1337	lastcell.faces[0] = ob->face;
1509		1338
1510	mask |= 0x1;	1339	mask |= 0x1;
1511	sl << uint16 (pl->face);	1340	sl << uint16 (ob->face);
1512		1341
1513	socket.send_faces (pl);	1342	socket.send_faces (ob);
1514	}	1343	}
1515	}	1344	}
1516	/* Top face */	1345	/* Top face */
1517	else if (update_space (sl, socket, ms, lastcell, 0))	1346	else if (update_space (sl, socket, ms, lastcell, 0))
1518	mask |= 0x1;	1347	mask |= 0x1;
1519
1520		1348
1521	/* Check to see if we are in fact sending anything for this	1349	/* Check to see if we are in fact sending anything for this
1522	* space by checking the mask. If so, update the mask.	1350	* space by checking the mask. If so, update the mask.
1523	* if not, reset the len to that from before adding the mask	1351	* if not, reset the len to that from before adding the mask
1524	* value, so we don't send those bits.	1352	* value, so we don't send those bits.
…		…
1558	}	1386	}
1559	} /* else this is a viewable space */	1387	} /* else this is a viewable space */
1560	} /* for x loop */	1388	} /* for x loop */
1561	} /* for y loop */	1389	} /* for y loop */
1562		1390
		1391	socket.flush_fx ();
		1392
1563	/* Verify that we in fact do need to send this */	1393	/* Verify that we in fact do need to send this */
1564	if (socket.ext_mapinfos)	1394	if (socket.ext_mapinfos)
1565	{	1395	{
1566	if (!(sl.length () > startlen || socket.sent_scroll))	1396	if (!(sl.length () > startlen || socket.sent_scroll))
1567	{	1397	{
…		…
1581	socket.send_packet (sl);	1411	socket.send_packet (sl);
1582	socket.sent_scroll = 0;	1412	socket.sent_scroll = 0;
1583	}	1413	}
1584	}	1414	}
1585		1415
1586	/**
1587	* Draws client map.
1588	*/
1589	void
1590	draw_client_map (object *pl)
1591	{
1592	int i, j;
1593	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1594	int mflags;
1595	struct Map newmap;
1596	maptile *m, *pm;
1597
1598	if (pl->type != PLAYER)
1599	{
1600	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1601	return;
1602	}
1603
1604	pm = pl->map;
1605
1606	/* If player is just joining the game, he isn't here yet, so the map
1607	* can get swapped out. If so, don't try to send them a map. All will
1608	* be OK once they really log in.
1609	*/
1610	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1611	return;
1612
1613	memset (&newmap, 0, sizeof (struct Map));
1614
1615	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1616	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1617	{
1618	ax = i;
1619	ay = j;
1620	m = pm;
1621	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1622
1623	if (mflags & P_OUT_OF_MAP)
1624	continue;
1625
1626	/* If a map is visible to the player, we don't want to swap it out
1627	* just to reload it. This should really call something like
1628	* swap_map, but this is much more efficient and 'good enough'
1629	*/
1630	if (mflags & P_NEW_MAP)
1631	m->timeout = 50;
1632	}
1633
1634	/* do LOS after calls to update_position */
1635	if (pl->contr->do_los)
1636	{
1637	update_los (pl);
1638	pl->contr->do_los = 0;
1639	}
1640
1641	/* Big maps need a different drawing mechanism to work */
1642	draw_client_map1 (pl);
1643	}
1644
1645
1646	/*****************************************************************************/	1416	/*****************************************************************************/
1647
1648	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1417	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1649
1650	/* a player. Of course, the client need to know the command to be able to */	1418	/* a player. Of course, the client need to know the command to be able to */
1651
1652	/* manage it ! */	1419	/* manage it ! */
1653
1654	/*****************************************************************************/	1420	/*****************************************************************************/
1655	void	1421	void
1656	send_plugin_custom_message (object *pl, char *buf)	1422	send_plugin_custom_message (object *pl, char *buf)
1657	{	1423	{
1658	pl->contr->ns->send_packet (buf);	1424	pl->contr->ns->send_packet (buf);
…		…
1669	sl << "replyinfo skill_info\n";	1435	sl << "replyinfo skill_info\n";
1670		1436
1671	for (int i = 1; i < NUM_SKILLS; i++)	1437	for (int i = 1; i < NUM_SKILLS; i++)
1672	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1438	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1673		1439
1674	if (sl.length () >= MAXSOCKBUF)	1440	if (sl.length () > MAXSOCKBUF)
1675	{	1441	{
1676	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1442	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1677	fatal (0);	1443	fatal (0);
1678	}	1444	}
1679		1445
…		…
1692	sl << "replyinfo spell_paths\n";	1458	sl << "replyinfo spell_paths\n";
1693		1459
1694	for (int i = 0; i < NRSPELLPATHS; i++)	1460	for (int i = 0; i < NRSPELLPATHS; i++)
1695	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1461	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1696		1462
1697	if (sl.length () >= MAXSOCKBUF)	1463	if (sl.length () > MAXSOCKBUF)
1698	{	1464	{
1699	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1465	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1700	fatal (0);	1466	fatal (0);
1701	}	1467	}
1702		1468
…		…
1721	if (spell->type == SPELL)	1487	if (spell->type == SPELL)
1722	{	1488	{
1723	int flags = 0;	1489	int flags = 0;
1724		1490
1725	/* check if we need to update it */	1491	/* check if we need to update it */
1726	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1492	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1727	{	1493	{
1728	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1494	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1729	flags |= UPD_SP_MANA;	1495	flags |= UPD_SP_MANA;
1730	}	1496	}
1731		1497
1732	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1498	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1733	{	1499	{
1734	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1500	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1735	flags |= UPD_SP_GRACE;	1501	flags |= UPD_SP_GRACE;
1736	}	1502	}
1737		1503
1738	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1504	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1739	{	1505	{
1740	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1506	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1741	flags |= UPD_SP_DAMAGE;	1507	flags |= UPD_SP_DAMAGE;
1742	}	1508	}
1743		1509
1744	if (flags)	1510	if (flags)
1745	{	1511	{
…		…
1747		1513
1748	sl << "updspell "	1514	sl << "updspell "
1749	<< uint8 (flags)	1515	<< uint8 (flags)
1750	<< uint32 (spell->count);	1516	<< uint32 (spell->count);
1751		1517
1752	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1518	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1753	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1519	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1754	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1520	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1755		1521
1756	pl->ns->send_packet (sl);	1522	pl->ns->send_packet (sl);
1757	}	1523	}
1758	}	1524	}
1759	}	1525	}
…		…
1789	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1555	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1790	return;	1556	return;
1791	}	1557	}
1792		1558
1793	/* store costs and damage in the object struct, to compare to later */	1559	/* store costs and damage in the object struct, to compare to later */
1794	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1560	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1795	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1561	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1796	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1562	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1797		1563
1798	/* figure out which skill it uses, if it uses one */	1564	/* figure out which skill it uses, if it uses one */
1799	if (spell->skill)	1565	if (spell->skill)
1800	{	1566	{
1801	for (i = 1; i < NUM_SKILLS; i++)	1567	for (i = 1; i < NUM_SKILLS; i++)
…		…
1811	{	1577	{
1812	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1578	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1813	spell->face = face_find ("burnout.x11", blank_face);	1579	spell->face = face_find ("burnout.x11", blank_face);
1814	}	1580	}
1815		1581
		1582	pl->ns->send_face (spell->face);
		1583
1816	/* send the current values */	1584	/* send the current values */
1817	sl << uint32 (spell->count)	1585	sl << uint32 (spell->count)
1818	<< uint16 (spell->level)	1586	<< uint16 (spell->level)
1819	<< uint16 (spell->casting_time)	1587	<< uint16 (spell->casting_time)
1820	<< uint16 (spell->last_sp)	1588	<< uint16 (spell->cached_sp)
1821	<< uint16 (spell->last_grace)	1589	<< uint16 (spell->cached_grace)
1822	<< uint16 (spell->last_eat)	1590	<< uint16 (spell->cached_eat)
1823	<< uint8 (skill)	1591	<< uint8 (skill)
1824	<< uint32 (spell->path_attuned)	1592	<< uint32 (spell->path_attuned)
1825	<< uint32 (spell->face)	1593	<< uint32 (spell->face)
1826	<< data8 (spell->name)	1594	<< data8 (spell->name)
1827	<< data16 (spell->msg);	1595	<< data16 (spell->msg);
…		…
1855	* bytes and 3 strings (because that is the spec) so we need to	1623	* bytes and 3 strings (because that is the spec) so we need to
1856	* check that the length of those 3 strings, plus the 23 bytes,	1624	* check that the length of those 3 strings, plus the 23 bytes,
1857	* won't take us over the length limit for the socket, if it does,	1625	* won't take us over the length limit for the socket, if it does,
1858	* we need to send what we already have, and restart packet formation	1626	* we need to send what we already have, and restart packet formation
1859	*/	1627	*/
		1628	if (spell->type != SPELL)
		1629	continue;
		1630
1860	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1631	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1861	* to show add_spell is 26 bytes + 2 strings. However, the overun	1632	* to show add_spell is 26 bytes + 2 strings. However, the overun
1862	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1633	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1863	* like it will fix this	1634	* like it will fix this
1864	*/	1635	*/
1865	if (spell->type != SPELL)
1866	continue;
1867
1868	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1636	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1869	{	1637	{
		1638	pl->ns->flush_fx ();
1870	pl->ns->send_packet (sl);	1639	pl->ns->send_packet (sl);
1871		1640
1872	sl.reset ();	1641	sl.reset ();
1873	sl << "addspell ";	1642	sl << "addspell ";
1874	}	1643	}
…		…
1882	return;	1651	return;
1883	}	1652	}
1884	else	1653	else
1885	append_spell (pl, sl, spell);	1654	append_spell (pl, sl, spell);
1886		1655
1887	if (sl.length () >= MAXSOCKBUF)	1656	if (sl.length () > MAXSOCKBUF)
1888	{	1657	{
1889	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1658	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1890	fatal (0);	1659	fatal (0);
1891	}	1660	}
1892		1661
1893	/* finally, we can send the packet */	1662	/* finally, we can send the packet */
		1663	pl->ns->flush_fx ();
1894	pl->ns->send_packet (sl);	1664	pl->ns->send_packet (sl);
1895	}	1665	}
1896		1666

Diff Legend

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