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

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.12 by pippijn, Sat Dec 9 17:28:37 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 (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	}	53	}
64		54
65	/**	55	/**
66	* Draws an extended message on the client.	56	* Draws an extended message on the client.
67	* ns the socket to send message to	57	* ns the socket to send message to
…		…
70	* subtype type and subtype of text message	60	* subtype type and subtype of text message
71	* 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
72	* message The main message	62	* message The main message
73	*/	63	*/
74	static void	64	static void
75	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)
76	{	66	{
77	char buf[HUGE_BUF];
78
79	snprintf (buf, HUGE_BUF, "drawextinfo %d %hhu %hhu %s", color, type, subtype, message);	67	ns->send_packet_printf ("drawextinfo %d %u %u %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	}	68	}
85		69
86	/**	70	/**
87	* Frontend for esrv_print_msg	71	* Frontend for esrv_print_msg
88	* \param colr message color	72	* \param colr message color
…		…
91	*	75	*
92	* 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.
93	*	77	*
94	* Else sends message to player via esrv_print_msg	78	* Else sends message to player via esrv_print_msg
95	*/	79	*/
96
97	static void	80	static void
98	print_message (int colr, const object pl, const char tmp)	81	print_message (int colr, const object pl, const char tmp)
99	{	82	{
100
101	if (!tmp)	83	if (!tmp)
102	tmp = "[NULL]";	84	tmp = "[NULL]";
103		85
104	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))	86	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))
105	return;	87	return;
106		88
107	if (pl->type == PLAYER)	89	if (pl->type == PLAYER)
108	{
109	esrv_print_msg (&pl->contr->socket, colr, (char *) tmp);	90	esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
110	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)
111	}	109	{
112	}	110	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	{	111	{
167	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)
168	break;	114	{
169	else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update)	115	// yes, take over matching buffer, print
170	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;
171	}	125	}
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		126
186	pl->contr->outputs[oldest].first_update = pticks;	127	if (lru->expire > buf->expire)
187	pl->contr->outputs[oldest].count = 1;	128	lru = buf;
188	pl->contr->outputs[oldest].buf = buf;
189	}
190	}	129	}
191	}
192		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);
193		136
		137	return false;
		138	}
194		139
195	/**	140	/**
196	* Sends message to player(s).	141	* Sends message to player(s).
197	*	142	*
198	* flags is various flags - mostly color, plus a few specials.	143	* flags is various flags - mostly color, plus a few specials.
199	*	144	*
200	* pri is priority. It is a little odd - the lower the value, the more	145	* 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	*	146	*
205	* 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
206	* in the flags.	148	* in the flags.
207	*	149	*
208	* 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.
209	*	151	*
210	*/	152	*/
211
212	void	153	void
213	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)
214	{	155	{
215
216	if (flags & NDI_ALL)	156	if (flags & NDI_ALL)
217	{	157	{
218	player *tmppl;	158	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);	159	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	{	160	}
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	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))
243	print_message (flags & NDI_COLOR_MASK, pl, buf);	168	print_message (flags & NDI_COLOR_MASK, op, buf);
		169	}
244	}	170	}
245		171
246	/**	172	/**
247	* Wrapper for new_draw_info printf-like.	173	* Wrapper for new_draw_info printf-like.
248	*	174	*
249	* 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
250	* 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
251	* 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
252	* client/server bandwidth (client could keep track of various strings	178	* client/server bandwidth (client could keep track of various strings
253	*/	179	*/
254
255	void	180	void
256	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, ...)
257	{	182	{
258	char buf[HUGE_BUF];
259
260	va_list ap;	183	va_list ap;
261
262	va_start (ap, format);	184	va_start (ap, format);
263		185	new_draw_info (flags, pri, pl, vformat (format, ap));
264	vsnprintf (buf, HUGE_BUF, format, ap);
265
266	va_end (ap);	186	va_end (ap);
267
268	new_draw_info (flags, pri, pl, buf);
269	}	187	}
270
271		188
272	void	189	void
273	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)
274	{	191	{
275
276	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))	192	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
277	return;	193	return;
278		194
279	if (pri >= pl->contr->listening)
280	return;
281	if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type))	195	if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
282	{	196	{
283	char buf = (char ) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);	197	char buf = (char ) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
284		198
285	if (buf == NULL)	199	if (buf == NULL)
286	LOG (llevError, "info::draw_ext_info -> Out of memory!");	200	LOG (llevError, "info::draw_ext_info -> Out of memory!");
…		…
291	new_draw_info (flags, pri, pl, buf);	205	new_draw_info (flags, pri, pl, buf);
292	free (buf);	206	free (buf);
293	}	207	}
294	}	208	}
295	else	209	else
296	{
297	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);
298	}
299	}	211	}
300		212
301	void	213	void
302	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, ...)
303	{	215	{
		216	va_list ap;
		217	va_start (ap, new_format);
304		218
305	char buf[HUGE_BUF];	219	if (!pl \|\| !pl->is_player ())
306
307	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
308	return;	220	return;
309		221
310	if (pri >= pl->contr->listening)	222	// TODO: just assume, and rip out?
311	return;
312	if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type))	223	if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
313	{	224	{
314	va_list ap;
315
316	LOG (llevDebug, "Non supported extension text type for client.\n");	225	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);	226	new_draw_info (flags, pri, pl, vformat (old_format, ap));
321	return;
322	}	227	}
323	else	228	else
324	{	229	{
325	va_list ap;	230	char *buf = vformat (new_format, 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);	231	strip_media_tag (buf);
331	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);
332	}	233	}
		234
		235	va_end (ap);
333	}	236	}
334		237
335	/**	238	/**
336	* 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.
337	*/	240	*/
338
339	void	241	void
340	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)
341	{	243	{
342	player *pl;	244	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)	245	if (pl->ob->map == map && pl->ob != op)
346	{
347	new_draw_info (color, 0, pl->ob, str);	246	new_draw_info (color, 0, pl->ob, str);
348	}
349	}	247	}
350		248
351	/**	249	/**
352	* Writes to everyone on the map except op1 and op2	250	* Writes to everyone on the map except op1 and op2
353	*/	251	*/
354		252	static void
355	void
356	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)
357	{	254	{
358	player *pl;	255	for_all_players (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)	256	if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
362	{
363	new_draw_info (color, 0, pl->ob, str);	257	new_draw_info (color, 0, pl->ob, str);
364	}
365	}	258	}
366		259
367	/**	260	/**
368	* Writes to everyone on the specified map	261	* Writes to everyone on the specified map
369	*/	262	*/
370
371	void	263	void
372	new_info_map (int color, maptile * map, const char *str)	264	new_info_map (int color, maptile * map, const char *str)
373	{	265	{
374	player *pl;	266	for_all_players (pl)
375
376	for (pl = first_player; pl != NULL; pl = pl->next)
377	if (pl->ob != NULL && pl->ob->map == map)	267	if (pl->ob->map == map)
378	{
379	new_draw_info (color, 0, pl->ob, str);	268	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	}	269	}
467		270
468	/**	271	/**
469	* Sets player title.	272	* Sets player title.
470	*/	273	*/
…		…
476	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);
477	else	280	else
478	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);
479	}	282	}
480		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	}
481		293
482	/**	294	/**
483	* Helper for magic map creation.	295	* Helper for magic map creation.
484	*	296	*
485	* 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.
…		…
491	* for various code values.	303	* for various code values.
492	*/	304	*/
493	static void	305	static void
494	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)
495	{	307	{
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++)	308	for (int dx = -1; dx <= 1; dx++)
502	{	309	{
503	for (dy = -1; dy <= 1; dy++)	310	for (int dy = -1; dy <= 1; dy++)
504	{	311	{
505	x = px + dx;	312	int x = px + dx;
506	y = py + dy;	313	int y = py + dy;
507		314
508	if (FABS (x) >= MAGIC_MAP_HALF \|\| FABS (y) >= MAGIC_MAP_HALF)	315	if (abs (x) >= MAGIC_MAP_HALF \|\| abs (y) >= MAGIC_MAP_HALF)
509	continue;	316	continue;
510		317
511	mp = pl->map;	318	mapxy pos (pl);
512	nx = pl->x + x;	319	pos.move (x, y);
513	ny = pl->y + y;
514		320
515	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	321	if (!pos.normalise ())
516	if (mflags & P_OUT_OF_MAP)
517	continue;	322	continue;
		323
		324	mapspace &ms = pos.ms ();
518		325
519	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)
520	{	327	{
		328	int mflags = ms.flags ();
		329
521	f = GET_MAP_FACE (mp, nx, ny, 0);	330	int f = GET_MAP_FACE (ms, 0);
522	if (f == blank_face)	331	if (f == blank_face)
		332	{
523	f = GET_MAP_FACE (mp, nx, ny, 1);	333	f = GET_MAP_FACE (ms, 1);
524	if (f == blank_face)	334	if (f == blank_face)
525	f = GET_MAP_FACE (mp, nx, ny, 2);	335	f = GET_MAP_FACE (ms, 2);
		336	}
		337
		338	int magicmap = faces [f].magicmap;
526		339
527	/* 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
528	* work.	341	* work.
529	*/	342	*/
530	if (mflags & P_BLOCKSVIEW)	343	if (mflags & P_BLOCKSVIEW)
531	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;
532	else	345	else
533	{	346	{
534	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;
535	magic_mapping_mark_recursive (pl, map_mark, x, y);	348	magic_mapping_mark_recursive (pl, map_mark, x, y);
536	}	349	}
537	}	350	}
538	}	351	}
539	}	352	}
540	}	353	}
541		354
542
543	/**	355	/**
544	* Creates magic map for player.	356	* Creates magic map for player.
545	*	357	*
546	* Note: For improved magic mapping display, the space that blocks	358	* Note: For improved magic mapping display, the space that blocks
547	* 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
548	* being nonzero have been changed to check for 1. Also, since	360	* 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.	361	* map_mark is a char value, putting 2 in should cause no problems.
550	*	362	*
551	* 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
552	* 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
553	* is for open spaces. map_mark should already have been initialized	365	* is for open spaces. map_mark should already have been initialised
554	* to zero before this is called.	366	* to zero before this is called.
555	* strength is an initial strength*2 rectangular area that we automatically	367	* strength is an initial strength*2 rectangular area that we automatically
556	* see in/penetrate through.	368	* see in/penetrate through.
557	*/	369	*/
558		370	static void
559	void
560	magic_mapping_mark (object pl, char map_mark, int strength)	371	magic_mapping_mark (object pl, char map_mark, int strength)
561	{	372	{
562	int x, y, mflags;
563	sint16 nx, ny;
564	maptile *mp;
565	New_Face *f;
566
567	for (x = -strength; x < strength; x++)	373	for (int x = -strength; x < strength; x++)
568	{	374	{
569	for (y = -strength; y < strength; y++)	375	for (int y = -strength; y < strength; y++)
570	{	376	{
571	mp = pl->map;	377	mapxy pos (pl);
572	nx = pl->x + x;	378	pos.move (x, y);
573	ny = pl->y + y;	379
574	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	380	if (!pos.normalise ())
575	if (mflags & P_OUT_OF_MAP)
576	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;
577	else	399	else
578	{	400	{
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);	401	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);	402	magic_mapping_mark_recursive (pl, map_mark, x, y);
592	}	403	}
593	}	404	}
594	}	405	}
595	}	406	}
596		407
597
598	/**	408	/**
599	* Creates and sends magic map to player.	409	* Creates and sends magic map to player.
600	*	410	*
601	* 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,
602	* but there is no real easy solution.	412	* but there is no real easy solution.
603	*	413	*
604	* Mark Wedel	414	* Mark Wedel
605	*/	415	*/
606
607	void	416	void
608	draw_magic_map (object *pl)	417	draw_magic_map (object *pl)
609	{	418	{
610	int x, y;
611	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);
612	int xmin, xmax, ymin, ymax;	420	int xmin, xmax, ymin, ymax;
613	SockList sl;
614		421
615	if (pl->type != PLAYER)	422	if (pl->type != PLAYER)
616	{	423	{
617	LOG (llevError, "Non player object called draw_map.\n");	424	LOG (llevError, "Non player object called draw_map.\n");
618	return;	425	return;
…		…
628	*/	435	*/
629	xmin = MAGIC_MAP_SIZE;	436	xmin = MAGIC_MAP_SIZE;
630	ymin = MAGIC_MAP_SIZE;	437	ymin = MAGIC_MAP_SIZE;
631	xmax = 0;	438	xmax = 0;
632	ymax = 0;	439	ymax = 0;
		440
633	for (x = 0; x < MAGIC_MAP_SIZE; x++)	441	for (int x = 0; x < MAGIC_MAP_SIZE; x++)
634	{
635	for (y = 0; y < MAGIC_MAP_SIZE; y++)	442	for (int y = 0; y < MAGIC_MAP_SIZE; y++)
		443	if (map_mark[x + pl->map->width * y] \| FACE_FLOOR)
636	{	444	{
637	if (map_mark[x + MAP_WIDTH (pl->map) * y] \| FACE_FLOOR)
638	{
639	xmin = x < xmin ? x : xmin;	445	xmin = x < xmin ? x : xmin;
640	xmax = x > xmax ? x : xmax;	446	xmax = x > xmax ? x : xmax;
641	ymin = y < ymin ? y : ymin;	447	ymin = y < ymin ? y : ymin;
642	ymax = y > ymax ? y : ymax;	448	ymax = y > ymax ? y : ymax;
643	}
644	}	449	}
645	}
646		450
647	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	451	packet sl;
648	snprintf ((char *) sl.buf, MAXSOCKBUF, "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),
649	MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);	453	MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
650	sl.len = strlen ((char *) sl.buf);
651		454
652	for (y = ymin; y <= ymax; y++)	455	for (int y = ymin; y <= ymax; y++)
653	{
654	for (x = xmin; x <= xmax; x++)	456	for (int x = xmin; x <= xmax; x++)
655	{
656	sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR;	457	sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
657	} /* x loop */
658	} /* y loop */
659		458
660	Send_With_Handling (&pl->contr->socket, &sl);	459	pl->contr->ns->send_packet (sl);
661	free (sl.buf);	460
662	free (map_mark);	461	free (map_mark);
663	}	462	}
664		463
665
666	/**
667	* Send a kill log record to sockets
668	*/
669
670	void
671	Log_Kill (const char Who, const char What, int WhatType, const char *With, int WithType)
672	{
673	size_t len;
674	char buf[MAX_BUF];
675
676	if (With != NULL)
677	snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
678	else
679	snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
680
681	len = strlen (buf);
682	}

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.12 by pippijn, Sat Dec 9 17:28:37 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.12 by pippijn, Sat Dec 9 17:28:37 2006 UTC vs.
Revision 1.56 by root, Fri Nov 6 13:07:28 2009 UTC