[ViewVC] Diff of: cvs/deliantra/server/socket/info.C

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.13 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.59 by root, Fri Mar 26 00:59:22 2010 UTC

…		…
1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
4		3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 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 it under
9	it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	(at your option) any later version.	11	* 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 Affero GNU General Public License
19	along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21		21	*
22	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	/**	25	/**
26	* \file	26	* \file
27	* Basic client output functions.	27	* Basic client output functions.
28	*	28	*
36	#include <sproto.h>	36	#include <sproto.h>
37	#include <stdarg.h>	37	#include <stdarg.h>
38	#include <spells.h>	38	#include <spells.h>
39	#include <skills.h>	39	#include <skills.h>
40		40
		41	#include <cstring>
		42
41	/**	43	/**
42	* Draws a normal message on the client. It is pretty	44	* Draws a normal message on the client. It is pretty
43	* much the same thing as the draw_info above, but takes a color	45	* much the same thing as the draw_info above, but takes a color
44	* parameter. the esrv_drawinfo functions should probably be	46	* parameter. the esrv_drawinfo functions should probably be
45	* replaced with this, just using black as the color.	47	* replaced with this, just using black as the color.
46	*/	48	*/
47	static void	49	static void
48	esrv_print_msg (NewSocket * ns, int color, const char *str)	50	esrv_print_msg (client ns, int color, const char str)
49	{	51	{
50	char buf[HUGE_BUF];	52	ns->send_msg (color, "info", str);
51
52	if (ns->status == Ns_Old)
53	{
54	snprintf (buf, HUGE_BUF, "%s\n", str);
55	}
56	else
57	{
58	snprintf (buf, HUGE_BUF, "drawinfo %d %s", color, str);
59	}
60
61	/* LOG(llevDebug,"sending %s to socket, len=%d\n", buf, strlen(buf));*/
62	Write_String_To_Socket (ns, buf, strlen (buf));
63	}
64
65	/**
66	* Draws an extended message on the client.
67	* ns the socket to send message to
68	* color color informations (used mainly if client does not support message type)
69	* type,
70	* subtype type and subtype of text message
71	* intro Intro message to send with main message if client does not support the message type
72	* message The main message
73	*/
74	static void
75	esrv_print_ext_msg (NewSocket * ns, int color, uint8 type, uint8 subtype, const char *message)
76	{
77	char buf[HUGE_BUF];
78
79	snprintf (buf, HUGE_BUF, "drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
80	Write_String_To_Socket (ns, buf, strlen (buf));
81
82	/* LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/
83
84	}	53	}
85		54
86	/**	55	/**
87	* Frontend for esrv_print_msg	56	* Frontend for esrv_print_msg
88	* \param colr message color	57	* \param colr message color
…		…
91	*	60	*
92	* If pl is NULL or without contr set, writes message to log.	61	* If pl is NULL or without contr set, writes message to log.
93	*	62	*
94	* Else sends message to player via esrv_print_msg	63	* Else sends message to player via esrv_print_msg
95	*/	64	*/
96
97	static void	65	static void
98	print_message (int colr, const object pl, const char tmp)	66	print_message (int colr, const object pl, const char tmp)
99	{	67	{
100
101	if (!tmp)	68	if (!tmp)
102	tmp = "[NULL]";	69	tmp = "[NULL]";
103		70
104	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))	71	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))
105	return;	72	return;
106		73
107	if (pl->type == PLAYER)	74	if (pl->type == PLAYER)
108	{
109	esrv_print_msg (&pl->contr->socket, colr, (char *) tmp);	75	esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
110	return;	76	}
		77
		78	bool
		79	client::msg_suppressed (const char *msg)
		80	{
		81	if (!pl)
		82	return false;
		83
		84	if (pl->outputs_count <= 1 \|\| !pl->outputs_sync)
		85	return false;
		86
		87	int len = strlen (msg);
		88
		89	if (len > MSG_BUF_SIZE)
		90	return false;
		91
		92	msg_buf *lru = msgbuf;
		93	for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf)
111	}	94	{
112	}	95	if (len == buf->len && !memcmp (msg, buf->msg, len))
113
114	/**
115	* Prints out the contents of specified buffer structures,
116	* and clears the string.
117	*/
118
119	void
120	flush_output_element (const object pl, Output_Buf outputs)
121	{
122	char tbuf[MAX_BUF];
123
124	if (outputs->buf == NULL)
125	return;
126	if (outputs->count > 1)
127	{
128	snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf);
129	print_message (NDI_BLACK, pl, tbuf);
130	}
131	else
132	print_message (NDI_BLACK, pl, &outputs->buf);
133
134	outputs->buf = NULL;
135	outputs->first_update = 0; /* This way, it will be reused */
136	}
137
138	/**
139	* Sends message to player through output buffers.
140	* \param pl player to send message
141	* \param buf message to send
142	*
143	* If player's output_count is 1, sends message directly.
144	*
145	* Else checks output buffers for specified message.
146	*
147	* If found, checks if message should be sent now.
148	*
149	* If message not already in buffers, flushes olders buffer,
150	* and adds message to queue.
151	*/
152
153	static void
154	check_output_buffers (const object pl, const char buf)
155	{
156	int i, oldest = 0;
157
158	if (pl->contr->outputs_count < 2)
159	{
160	print_message (NDI_BLACK, pl, buf);
161	return;
162	}
163	else
164	{
165	for (i = 0; i < NUM_OUTPUT_BUFS; i++)
166	{	96	{
167	if (pl->contr->outputs[i].buf && !strcmp (buf, pl->contr->outputs[i].buf))	97	// found matching buf, see if expired
		98	if (buf->expire <= pticks \|\| !buf->count)
168	break;	99	{
169	else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update)	100	// yes, take over matching buffer, print
170	oldest = i;	101	buf->expire = pticks + pl->outputs_sync;
		102	buf->count = pl->outputs_count;
		103
		104	return false;
		105	}
		106
		107	// no, suppress
		108	--buf->count;
		109	return true;
171	}	110	}
172	/* We found a match */
173	if (i < NUM_OUTPUT_BUFS)
174	{
175	pl->contr->outputs[i].count++;
176	if (pl->contr->outputs[i].count >= pl->contr->outputs_count)
177	{
178	flush_output_element (pl, &pl->contr->outputs[i]);
179	}
180	}
181	/* No match - flush the oldest, and put the new one in */
182	else
183	{
184	flush_output_element (pl, &pl->contr->outputs[oldest]);
185		111
186	pl->contr->outputs[oldest].first_update = pticks;	112	if (lru->expire > buf->expire)
187	pl->contr->outputs[oldest].count = 1;	113	lru = buf;
188	pl->contr->outputs[oldest].buf = buf;
189	}
190	}	114	}
191	}
192		115
		116	// new message, evoke oldest buffer
		117	lru->expire = pticks + pl->outputs_sync;
		118	lru->count = pl->outputs_count;
		119	lru->len = len;
		120	memcpy (lru->msg, msg, len);
193		121
		122	return false;
		123	}
194		124
195	/**	125	/**
196	* Sends message to player(s).	126	* Sends message to player(s).
197	*	127	*
198	* flags is various flags - mostly color, plus a few specials.	128	* flags is various flags - mostly color, plus a few specials.
199	*	129	*
200	* pri is priority. It is a little odd - the lower the value, the more	130	* pri is unused.
201	* important it is. Thus, 0 gets sent no matter what. Otherwise, the
202	* value must be less than the listening level that the player has set.
203	* Unfortunately, there is no clear guideline on what each level does what.
204	*	131	*
205	* pl can be passed as NULL - in fact, this will be done if NDI_ALL is set	132	* pl can be passed as NULL - in fact, this will be done if NDI_ALL is set
206	* in the flags.	133	* in the flags.
207	*	134	*
208	* If message is black, and not NDI_UNIQUE, gets sent through output buffers.	135	* If message is black, and not NDI_UNIQUE, gets sent through output buffers.
209	*	136	*
210	*/	137	*/
211
212	void	138	void
213	new_draw_info (int flags, int pri, const object pl, const char buf)	139	new_draw_info (int flags, int pri, const object op, const char buf)
214	{	140	{
215
216	if (flags & NDI_ALL)	141	if (flags & NDI_ALL)
217	{	142	{
218	player *tmppl;	143	for_all_players (pl)
219
220	for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
221	new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);	144	new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf);
222
223	return;
224	}
225
226	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))
227	{	145	}
228	/* Write to the socket? */
229	print_message (0, NULL, buf);
230	return;
231	}
232
233	if (pl->type != PLAYER)
234	return;
235
236	if (pri >= pl->contr->listening)
237	return;
238
239	if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
240	/* following prints stuff out, as appropriate */
241	check_output_buffers (pl, buf);
242	else	146	else
		147	{
		148	if (!op \|\| !op->contr \|\| !op->contr->ns)
		149	return;
		150
		151	if ((flags & (NDI_COLOR_MASK \| NDI_UNIQUE)) != NDI_BLACK
		152	\|\| !op->contr->ns->msg_suppressed (buf))
243	print_message (flags & NDI_COLOR_MASK, pl, buf);	153	print_message (flags & NDI_COLOR_MASK, op, buf);
		154	}
244	}	155	}
245		156
246	/**	157	/**
247	* Wrapper for new_draw_info printf-like.	158	* Wrapper for new_draw_info printf-like.
248	*	159	*
249	* This is a pretty trivial function, but it allows us to use printf style	160	* This is a pretty trivial function, but it allows us to use printf style
250	* formatting, so instead of the calling function having to do it, we do	161	* formatting, so instead of the calling function having to do it, we do
251	* it here. It may also have advantages in the future for reduction of	162	* it here. It may also have advantages in the future for reduction of
252	* client/server bandwidth (client could keep track of various strings	163	* client/server bandwidth (client could keep track of various strings
253	*/	164	*/
254
255	void	165	void
256	new_draw_info_format (int flags, int pri, const object pl, const char format, ...)	166	new_draw_info_format (int flags, int pri, const object pl, const char format, ...)
257	{	167	{
258	char buf[HUGE_BUF];
259
260	va_list ap;	168	va_list ap;
261
262	va_start (ap, format);	169	va_start (ap, format);
263		170	new_draw_info (flags, pri, pl, vformat (format, ap));
264	vsnprintf (buf, HUGE_BUF, format, ap);
265
266	va_end (ap);	171	va_end (ap);
267
268	new_draw_info (flags, pri, pl, buf);
269	}
270
271
272	void
273	draw_ext_info (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char message, const char *oldmessage)
274	{
275
276	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
277	return;
278
279	if (pri >= pl->contr->listening)
280	return;
281	if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type))
282	{
283	char buf = (char ) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
284
285	if (buf == NULL)
286	LOG (llevError, "info::draw_ext_info -> Out of memory!");
287	else
288	{
289	strcpy (buf, oldmessage == NULL ? message : oldmessage);
290	strip_media_tag (buf);
291	new_draw_info (flags, pri, pl, buf);
292	free (buf);
293	}
294	}
295	else
296	{
297	esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message);
298	}
299	}
300
301	void
302	draw_ext_info_format (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char old_format, char *new_format, ...)
303	{
304
305	char buf[HUGE_BUF];
306
307	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
308	return;
309
310	if (pri >= pl->contr->listening)
311	return;
312	if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type))
313	{
314	va_list ap;
315
316	LOG (llevDebug, "Non supported extension text type for client.\n");
317	va_start (ap, new_format);
318	vsnprintf (buf, HUGE_BUF, old_format, ap);
319	va_end (ap);
320	new_draw_info (flags, pri, pl, buf);
321	return;
322	}
323	else
324	{
325	va_list ap;
326
327	va_start (ap, new_format);
328	vsnprintf (buf, HUGE_BUF, new_format, ap);
329	va_end (ap);
330	strip_media_tag (buf);
331	esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf);
332	}
333	}	172	}
334		173
335	/**	174	/**
336	* Writes to everyone on the map except op. This is useful for emotions.	175	* Writes to everyone on the map except op. This is useful for emotions.
337	*/	176	*/
338
339	void	177	void
340	new_info_map_except (int color, maptile * map, object op, const char str)	178	new_info_map_except (int color, maptile * map, object op, const char str)
341	{	179	{
342	player *pl;	180	for_all_players (pl)
343
344	for (pl = first_player; pl != NULL; pl = pl->next)
345	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)	181	if (pl->ob->map == map && pl->ob != op)
346	{
347	new_draw_info (color, 0, pl->ob, str);	182	new_draw_info (color, 0, pl->ob, str);
348	}
349	}
350
351	/**
352	* Writes to everyone on the map except op1 and op2
353	*/
354
355	void
356	new_info_map_except2 (int color, maptile * map, object op1, object op2, const char *str)
357	{
358	player *pl;
359
360	for (pl = first_player; pl != NULL; pl = pl->next)
361	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
362	{
363	new_draw_info (color, 0, pl->ob, str);
364	}
365	}	183	}
366		184
367	/**	185	/**
368	* Writes to everyone on the specified map	186	* Writes to everyone on the specified map
369	*/	187	*/
370
371	void	188	void
372	new_info_map (int color, maptile * map, const char *str)	189	new_info_map (int color, maptile * map, const char *str)
373	{	190	{
374	player *pl;	191	for_all_players (pl)
375
376	for (pl = first_player; pl != NULL; pl = pl->next)
377	if (pl->ob != NULL && pl->ob->map == map)	192	if (pl->ob->map == map)
378	{
379	new_draw_info (color, 0, pl->ob, str);	193	new_draw_info (color, 0, pl->ob, str);
380	}
381	}
382
383
384	/**
385	* This does nothing now. However, in theory, we should probably send
386	* something to the client and let the client figure out how it might want
387	* to handle this
388	*/
389	void
390	clear_win_info (object *op)
391	{
392	}
393
394	/**
395	* Get player's current range attack in obuf.
396	*/
397	void
398	rangetostring (object pl, char obuf)
399	{
400	switch (pl->contr->shoottype)
401	{
402	case range_none:
403	strcpy (obuf, "Range: nothing");
404	break;
405
406	case range_bow:
407	{
408	object *op;
409
410	for (op = pl->inv; op; op = op->below)
411	if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
412	break;
413
414	if (op == NULL)
415	break;
416
417	sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
418	}
419	break;
420
421	case range_magic:
422	if (settings.casting_time == TRUE)
423	{
424	if (pl->casting_time > -1)
425	{
426	if (pl->casting_time == 0)
427	sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name);
428	else
429	sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name);
430	}
431	else
432	sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
433	}
434	else
435	sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
436	break;
437
438	case range_misc:
439	sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
440	break;
441
442	/* range_scroll is only used for controlling golems. If the
443	* the player does not have a golem, reset some things.
444	*/
445	case range_golem:
446	if (pl->contr->ranges[range_golem] != NULL)
447	sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
448	else
449	{
450	pl->contr->shoottype = range_none;
451	strcpy (obuf, "Range: nothing");
452	}
453	break;
454
455	case range_skill:
456	sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
457	break;
458
459	case range_builder:
460	sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
461	break;
462
463	default:
464	strcpy (obuf, "Range: illegal");
465	}
466	}	194	}
467		195
468	/**	196	/**
469	* Sets player title.	197	* Sets player title.
470	*/	198	*/
…		…
476	sprintf (buf, "Player: %s the %s", (const char ) pl->name, (const char ) pl->contr->title);	204	sprintf (buf, "Player: %s the %s", (const char ) pl->name, (const char ) pl->contr->title);
477	else	205	else
478	sprintf (buf, "Player: %s %s", (const char ) pl->name, (const char ) pl->contr->own_title);	206	sprintf (buf, "Player: %s %s", (const char ) pl->name, (const char ) pl->contr->own_title);
479	}	207	}
480		208
		209	// formerly a macro, used only by magic map, so optimised it out
		210	static inline faceidx
		211	GET_MAP_FACE (mapspace &ms, int layer)
		212	{
		213	if (object *op = ms.faces_obj [layer])
		214	return op->face;
		215	else
		216	return 0;
		217	}
481		218
482	/**	219	/**
483	* Helper for magic map creation.	220	* Helper for magic map creation.
484	*	221	*
485	* Takes a player, the map_mark array and an x and y starting position.	222	* Takes a player, the map_mark array and an x and y starting position.
…		…
491	* for various code values.	228	* for various code values.
492	*/	229	*/
493	static void	230	static void
494	magic_mapping_mark_recursive (object pl, char map_mark, int px, int py)	231	magic_mapping_mark_recursive (object pl, char map_mark, int px, int py)
495	{	232	{
496	int x, y, dx, dy, mflags;
497	sint16 nx, ny;
498	maptile *mp;
499	New_Face *f;
500
501	for (dx = -1; dx <= 1; dx++)	233	for (int dx = -1; dx <= 1; dx++)
502	{	234	{
503	for (dy = -1; dy <= 1; dy++)	235	for (int dy = -1; dy <= 1; dy++)
504	{	236	{
505	x = px + dx;	237	int x = px + dx;
506	y = py + dy;	238	int y = py + dy;
507		239
508	if (FABS (x) >= MAGIC_MAP_HALF \|\| FABS (y) >= MAGIC_MAP_HALF)	240	if (abs (x) >= MAGIC_MAP_HALF \|\| abs (y) >= MAGIC_MAP_HALF)
509	continue;	241	continue;
510		242
511	mp = pl->map;	243	mapxy pos (pl);
512	nx = pl->x + x;	244	pos.move (x, y);
513	ny = pl->y + y;
514		245
515	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	246	if (!pos.normalise ())
516	if (mflags & P_OUT_OF_MAP)
517	continue;	247	continue;
		248
		249	mapspace &ms = pos.ms ();
518		250
519	if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)	251	if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
520	{	252	{
		253	int mflags = ms.flags ();
		254
521	f = GET_MAP_FACE (mp, nx, ny, 0);	255	int f = GET_MAP_FACE (ms, 0);
522	if (f == blank_face)	256	if (f == blank_face)
		257	{
523	f = GET_MAP_FACE (mp, nx, ny, 1);	258	f = GET_MAP_FACE (ms, 1);
524	if (f == blank_face)	259	if (f == blank_face)
525	f = GET_MAP_FACE (mp, nx, ny, 2);	260	f = GET_MAP_FACE (ms, 2);
		261	}
		262
		263	int magicmap = faces [f].magicmap;
526		264
527	/* Should probably have P_NO_MAGIC here also, but then shops don't	265	/* Should probably have P_NO_MAGIC here also, but then shops don't
528	* work.	266	* work.
529	*/	267	*/
530	if (mflags & P_BLOCKSVIEW)	268	if (mflags & P_BLOCKSVIEW)
531	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| (f ? f->magicmap : 0);	269	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| magicmap;
532	else	270	else
533	{	271	{
534	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| (f ? f->magicmap : 0);	272	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| magicmap;
535	magic_mapping_mark_recursive (pl, map_mark, x, y);	273	magic_mapping_mark_recursive (pl, map_mark, x, y);
536	}	274	}
537	}	275	}
538	}	276	}
539	}	277	}
540	}	278	}
541		279
542
543	/**	280	/**
544	* Creates magic map for player.	281	* Creates magic map for player.
545	*	282	*
546	* Note: For improved magic mapping display, the space that blocks	283	* Note: For improved magic mapping display, the space that blocks
547	* the view is now marked with value 2. Any dependencies of map_mark	284	* the view is now marked with value 2. Any dependencies of map_mark
548	* being nonzero have been changed to check for 1. Also, since	285	* being nonzero have been changed to check for 1. Also, since
549	* map_mark is a char value, putting 2 in should cause no problems.	286	* map_mark is a char value, putting 2 in should cause no problems.
550	*	287	*
551	* This function examines the map the player is on, and determines what	288	* This function examines the map the player is on, and determines what
552	* is visible. 2 is set for walls or objects that blocks view. 1	289	* is visible. 2 is set for walls or objects that blocks view. 1
553	* is for open spaces. map_mark should already have been initialized	290	* is for open spaces. map_mark should already have been initialised
554	* to zero before this is called.	291	* to zero before this is called.
555	* strength is an initial strength*2 rectangular area that we automatically	292	* strength is an initial strength*2 rectangular area that we automatically
556	* see in/penetrate through.	293	* see in/penetrate through.
557	*/	294	*/
558		295	static void
559	void
560	magic_mapping_mark (object pl, char map_mark, int strength)	296	magic_mapping_mark (object pl, char map_mark, int strength)
561	{	297	{
562	int x, y, mflags;
563	sint16 nx, ny;
564	maptile *mp;
565	New_Face *f;
566
567	for (x = -strength; x < strength; x++)	298	for (int x = -strength; x < strength; x++)
568	{	299	{
569	for (y = -strength; y < strength; y++)	300	for (int y = -strength; y < strength; y++)
570	{	301	{
571	mp = pl->map;	302	mapxy pos (pl);
572	nx = pl->x + x;	303	pos.move (x, y);
573	ny = pl->y + y;	304
574	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	305	if (!pos.normalise ())
575	if (mflags & P_OUT_OF_MAP)
576	continue;	306	continue;
		307
		308	mapspace &ms = pos.ms ();
		309
		310	int mflags = ms.flags ();
		311
		312	int f = GET_MAP_FACE (ms, 0);
		313	if (f == blank_face)
		314	{
		315	f = GET_MAP_FACE (ms, 1);
		316	if (f == blank_face)
		317	f = GET_MAP_FACE (ms, 2);
		318	}
		319
		320	int magicmap = faces [f].magicmap;
		321
		322	if (mflags & P_BLOCKSVIEW)
		323	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| magicmap;
577	else	324	else
578	{	325	{
579	f = GET_MAP_FACE (mp, nx, ny, 0);
580	if (f == blank_face)
581	f = GET_MAP_FACE (mp, nx, ny, 1);
582	if (f == blank_face)
583	f = GET_MAP_FACE (mp, nx, ny, 2);
584	}
585
586	if (mflags & P_BLOCKSVIEW)
587	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| (f ? f->magicmap : 0);
588	else
589	{
590	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| (f ? f->magicmap : 0);	326	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| magicmap;
591	magic_mapping_mark_recursive (pl, map_mark, x, y);	327	magic_mapping_mark_recursive (pl, map_mark, x, y);
592	}	328	}
593	}	329	}
594	}	330	}
595	}	331	}
596		332
597
598	/**	333	/**
599	* Creates and sends magic map to player.	334	* Creates and sends magic map to player.
600	*	335	*
601	* The following function is a lot messier than it really should be,	336	* The following function is a lot messier than it really should be,
602	* but there is no real easy solution.	337	* but there is no real easy solution.
603	*	338	*
604	* Mark Wedel	339	* Mark Wedel
605	*/	340	*/
606
607	void	341	void
608	draw_magic_map (object *pl)	342	draw_magic_map (object *pl)
609	{	343	{
610	char map_mark = (char )calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);	344	char map_mark = (char )calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
611	int xmin, xmax, ymin, ymax;	345	int xmin, xmax, ymin, ymax;
…		…
629	xmax = 0;	363	xmax = 0;
630	ymax = 0;	364	ymax = 0;
631		365
632	for (int x = 0; x < MAGIC_MAP_SIZE; x++)	366	for (int x = 0; x < MAGIC_MAP_SIZE; x++)
633	for (int y = 0; y < MAGIC_MAP_SIZE; y++)	367	for (int y = 0; y < MAGIC_MAP_SIZE; y++)
634	if (map_mark[x + MAP_WIDTH (pl->map) * y] \| FACE_FLOOR)	368	if (map_mark[x + pl->map->width * y] \| FACE_FLOOR)
635	{	369	{
636	xmin = x < xmin ? x : xmin;	370	xmin = x < xmin ? x : xmin;
637	xmax = x > xmax ? x : xmax;	371	xmax = x > xmax ? x : xmax;
638	ymin = y < ymin ? y : ymin;	372	ymin = y < ymin ? y : ymin;
639	ymax = y > ymax ? y : ymax;	373	ymax = y > ymax ? y : ymax;
640	}	374	}
641		375
642	SockList sl (MAXSOCKBUF);	376	packet sl;
643	sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),	377	sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
644	MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);	378	MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
645		379
646	for (int y = ymin; y <= ymax; y++)	380	for (int y = ymin; y <= ymax; y++)
647	for (int x = xmin; x <= xmax; x++)	381	for (int x = xmin; x <= xmax; x++)
648	sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);	382	sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
649		383
650	Send_With_Handling (&pl->contr->socket, &sl);	384	pl->contr->ns->send_packet (sl);
651
652	sl.free ();
653		385
654	free (map_mark);	386	free (map_mark);
655	}	387	}
656		388
657
658	/**
659	* Send a kill log record to sockets
660	*/
661
662	void
663	Log_Kill (const char Who, const char What, int WhatType, const char *With, int WithType)
664	{
665	size_t len;
666	char buf[MAX_BUF];
667
668	if (With != NULL)
669	snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
670	else
671	snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
672
673	len = strlen (buf);
674	}

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.13 by root, Wed Dec 13 21:27:09 2006 UTC vs. Revision 1.59 by root, Fri Mar 26 00:59:22 2010 UTC

Diff Legend

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.13 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.59 by root, Fri Mar 26 00:59:22 2010 UTC