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

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

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.17 by root, Thu Dec 14 04:30:33 2006 UTC vs. Revision 1.56 by root, Fri Nov 6 13:07:28 2009 UTC

Diff Legend

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.17 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.56 by root, Fri Nov 6 13:07:28 2009 UTC