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

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

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.14 by root, Thu Dec 14 01:12:35 2006 UTC vs. Revision 1.55 by root, Fri Nov 6 12:49:19 2009 UTC

Diff Legend

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.14 by root, Thu Dec 14 01:12:35 2006 UTC vs.
Revision 1.55 by root, Fri Nov 6 12:49:19 2009 UTC