[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.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 (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	}
59
60	/**
61	* Draws an extended message on the client.
62	* ns the socket to send message to
63	* color color informations (used mainly if client does not support message type)
64	* type,
65	* subtype type and subtype of text message
66	* intro Intro message to send with main message if client does not support the message type
67	* message The main message
68	*/
69	static void
70	esrv_print_ext_msg (client_socket * ns, int color, uint8 type, uint8 subtype, const char *message)
71	{
72	packet sl;
73
74	sl.printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
75	ns->send_packet (sl);
76	}	53	}
77		54
78	/**	55	/**
79	* Frontend for esrv_print_msg	56	* Frontend for esrv_print_msg
80	* \param colr message color	57	* \param colr message color
…		…
83	*	60	*
84	* 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.
85	*	62	*
86	* Else sends message to player via esrv_print_msg	63	* Else sends message to player via esrv_print_msg
87	*/	64	*/
88
89	static void	65	static void
90	print_message (int colr, const object pl, const char tmp)	66	print_message (int colr, const object pl, const char tmp)
91	{	67	{
92
93	if (!tmp)	68	if (!tmp)
94	tmp = "[NULL]";	69	tmp = "[NULL]";
95		70
96	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))	71	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))
97	return;	72	return;
98		73
99	if (pl->type == PLAYER)	74	if (pl->type == PLAYER)
100	esrv_print_msg (pl->contr->socket, colr, (char *) tmp);	75	esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
101	}	76	}
102		77
103	/**	78	bool
104	* Prints out the contents of specified buffer structures,	79	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	{	80	{
111	char tbuf[MAX_BUF];	81	if (!pl)
112
113	if (outputs->buf == NULL)
114	return;	82	return false;
115	if (outputs->count > 1)	83
116	{	84	if (pl->outputs_count <= 1 \|\| !pl->outputs_sync)
117	snprintf (tbuf, MAX_BUF, "%d times %s", outputs->count, &outputs->buf);	85	return false;
118	print_message (NDI_BLACK, pl, tbuf);	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)
119	}	94	{
120	else	95	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	{	96	{
156	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)
157	break;	99	{
158	else if (pl->contr->outputs[i].first_update < pl->contr->outputs[oldest].first_update)	100	// yes, take over matching buffer, print
159	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;
160	}	110	}
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		111
175	pl->contr->outputs[oldest].first_update = pticks;	112	if (lru->expire > buf->expire)
176	pl->contr->outputs[oldest].count = 1;	113	lru = buf;
177	pl->contr->outputs[oldest].buf = buf;
178	}
179	}	114	}
180	}
181		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);
182		121
		122	return false;
		123	}
183		124
184	/**	125	/**
185	* Sends message to player(s).	126	* Sends message to player(s).
186	*	127	*
187	* flags is various flags - mostly color, plus a few specials.	128	* flags is various flags - mostly color, plus a few specials.
188	*	129	*
189	* pri is priority. It is a little odd - the lower the value, the more	130	* 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	*	131	*
194	* 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
195	* in the flags.	133	* in the flags.
196	*	134	*
197	* 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.
198	*	136	*
199	*/	137	*/
200
201	void	138	void
202	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)
203	{	140	{
204
205	if (flags & NDI_ALL)	141	if (flags & NDI_ALL)
206	{	142	{
207	player *tmppl;	143	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);	144	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	{	145	}
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	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))
232	print_message (flags & NDI_COLOR_MASK, pl, buf);	153	print_message (flags & NDI_COLOR_MASK, op, buf);
		154	}
233	}	155	}
234		156
235	/**	157	/**
236	* Wrapper for new_draw_info printf-like.	158	* Wrapper for new_draw_info printf-like.
237	*	159	*
238	* 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
239	* 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
240	* 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
241	* client/server bandwidth (client could keep track of various strings	163	* client/server bandwidth (client could keep track of various strings
242	*/	164	*/
243
244	void	165	void
245	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, ...)
246	{	167	{
247	char buf[HUGE_BUF];
248
249	va_list ap;	168	va_list ap;
250
251	va_start (ap, format);	169	va_start (ap, format);
252		170	new_draw_info (flags, pri, pl, vformat (format, ap));
253	vsnprintf (buf, HUGE_BUF, format, ap);
254
255	va_end (ap);	171	va_end (ap);
256
257	new_draw_info (flags, pri, pl, buf);
258	}
259
260
261	void
262	draw_ext_info (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char message, const char *oldmessage)
263	{
264
265	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
266	return;
267
268	if (pri >= pl->contr->listening)
269	return;
270
271	if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))
272	{
273	char buf = (char ) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
274
275	if (buf == NULL)
276	LOG (llevError, "info::draw_ext_info -> Out of memory!");
277	else
278	{
279	strcpy (buf, oldmessage == NULL ? message : oldmessage);
280	strip_media_tag (buf);
281	new_draw_info (flags, pri, pl, buf);
282	free (buf);
283	}
284	}
285	else
286	esrv_print_ext_msg (pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message);
287	}
288
289	void
290	draw_ext_info_format (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char old_format, char *new_format, ...)
291	{
292
293	char buf[HUGE_BUF];
294
295	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
296	return;
297
298	if (pri >= pl->contr->listening)
299	return;
300
301	if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))
302	{
303	va_list ap;
304
305	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);
310	return;
311	}
312	else
313	{
314	va_list 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);
320	esrv_print_ext_msg (pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf);
321	}
322	}	172	}
323		173
324	/**	174	/**
325	* 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.
326	*/	176	*/
327
328	void	177	void
329	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)
330	{	179	{
331	player *pl;	180	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)	181	if (pl->ob->map == map && pl->ob != op)
335	{
336	new_draw_info (color, 0, pl->ob, str);	182	new_draw_info (color, 0, pl->ob, str);
337	}
338	}
339
340	/**
341	* Writes to everyone on the map except op1 and op2
342	*/
343
344	void
345	new_info_map_except2 (int color, maptile * map, object op1, object op2, const char *str)
346	{
347	player *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)
351	{
352	new_draw_info (color, 0, pl->ob, str);
353	}
354	}	183	}
355		184
356	/**	185	/**
357	* Writes to everyone on the specified map	186	* Writes to everyone on the specified map
358	*/	187	*/
359
360	void	188	void
361	new_info_map (int color, maptile * map, const char *str)	189	new_info_map (int color, maptile * map, const char *str)
362	{	190	{
363	player *pl;	191	for_all_players (pl)
364
365	for (pl = first_player; pl != NULL; pl = pl->next)
366	if (pl->ob != NULL && pl->ob->map == map)	192	if (pl->ob->map == map)
367	{
368	new_draw_info (color, 0, pl->ob, str);	193	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	}	194	}
456		195
457	/**	196	/**
458	* Sets player title.	197	* Sets player title.
459	*/	198	*/
…		…
465	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);
466	else	205	else
467	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);
468	}	207	}
469		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	}
470		218
471	/**	219	/**
472	* Helper for magic map creation.	220	* Helper for magic map creation.
473	*	221	*
474	* 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.
…		…
480	* for various code values.	228	* for various code values.
481	*/	229	*/
482	static void	230	static void
483	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)
484	{	232	{
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++)	233	for (int dx = -1; dx <= 1; dx++)
491	{	234	{
492	for (dy = -1; dy <= 1; dy++)	235	for (int dy = -1; dy <= 1; dy++)
493	{	236	{
494	x = px + dx;	237	int x = px + dx;
495	y = py + dy;	238	int y = py + dy;
496		239
497	if (FABS (x) >= MAGIC_MAP_HALF \|\| FABS (y) >= MAGIC_MAP_HALF)	240	if (abs (x) >= MAGIC_MAP_HALF \|\| abs (y) >= MAGIC_MAP_HALF)
498	continue;	241	continue;
499		242
500	mp = pl->map;	243	mapxy pos (pl);
501	nx = pl->x + x;	244	pos.move (x, y);
502	ny = pl->y + y;
503		245
504	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	246	if (!pos.normalise ())
505	if (mflags & P_OUT_OF_MAP)
506	continue;	247	continue;
		248
		249	mapspace &ms = pos.ms ();
507		250
508	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)
509	{	252	{
		253	int mflags = ms.flags ();
		254
510	f = GET_MAP_FACE (mp, nx, ny, 0);	255	int f = GET_MAP_FACE (ms, 0);
511	if (f == blank_face)	256	if (f == blank_face)
		257	{
512	f = GET_MAP_FACE (mp, nx, ny, 1);	258	f = GET_MAP_FACE (ms, 1);
513	if (f == blank_face)	259	if (f == blank_face)
514	f = GET_MAP_FACE (mp, nx, ny, 2);	260	f = GET_MAP_FACE (ms, 2);
		261	}
		262
		263	int magicmap = faces [f].magicmap;
515		264
516	/* 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
517	* work.	266	* work.
518	*/	267	*/
519	if (mflags & P_BLOCKSVIEW)	268	if (mflags & P_BLOCKSVIEW)
520	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;
521	else	270	else
522	{	271	{
523	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;
524	magic_mapping_mark_recursive (pl, map_mark, x, y);	273	magic_mapping_mark_recursive (pl, map_mark, x, y);
525	}	274	}
526	}	275	}
527	}	276	}
528	}	277	}
529	}	278	}
530		279
531
532	/**	280	/**
533	* Creates magic map for player.	281	* Creates magic map for player.
534	*	282	*
535	* Note: For improved magic mapping display, the space that blocks	283	* Note: For improved magic mapping display, the space that blocks
536	* 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
537	* being nonzero have been changed to check for 1. Also, since	285	* 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.	286	* map_mark is a char value, putting 2 in should cause no problems.
539	*	287	*
540	* 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
541	* 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
542	* is for open spaces. map_mark should already have been initialized	290	* is for open spaces. map_mark should already have been initialised
543	* to zero before this is called.	291	* to zero before this is called.
544	* strength is an initial strength*2 rectangular area that we automatically	292	* strength is an initial strength*2 rectangular area that we automatically
545	* see in/penetrate through.	293	* see in/penetrate through.
546	*/	294	*/
547		295	static void
548	void
549	magic_mapping_mark (object pl, char map_mark, int strength)	296	magic_mapping_mark (object pl, char map_mark, int strength)
550	{	297	{
551	int x, y, mflags;
552	sint16 nx, ny;
553	maptile *mp;
554	New_Face *f;
555
556	for (x = -strength; x < strength; x++)	298	for (int x = -strength; x < strength; x++)
557	{	299	{
558	for (y = -strength; y < strength; y++)	300	for (int y = -strength; y < strength; y++)
559	{	301	{
560	mp = pl->map;	302	mapxy pos (pl);
561	nx = pl->x + x;	303	pos.move (x, y);
562	ny = pl->y + y;	304
563	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	305	if (!pos.normalise ())
564	if (mflags & P_OUT_OF_MAP)
565	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;
566	else	324	else
567	{	325	{
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);	326	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);	327	magic_mapping_mark_recursive (pl, map_mark, x, y);
581	}	328	}
582	}	329	}
583	}	330	}
584	}	331	}
585		332
586
587	/**	333	/**
588	* Creates and sends magic map to player.	334	* Creates and sends magic map to player.
589	*	335	*
590	* 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,
591	* but there is no real easy solution.	337	* but there is no real easy solution.
592	*	338	*
593	* Mark Wedel	339	* Mark Wedel
594	*/	340	*/
595
596	void	341	void
597	draw_magic_map (object *pl)	342	draw_magic_map (object *pl)
598	{	343	{
599	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);
600	int xmin, xmax, ymin, ymax;	345	int xmin, xmax, ymin, ymax;
…		…
618	xmax = 0;	363	xmax = 0;
619	ymax = 0;	364	ymax = 0;
620		365
621	for (int x = 0; x < MAGIC_MAP_SIZE; x++)	366	for (int x = 0; x < MAGIC_MAP_SIZE; x++)
622	for (int y = 0; y < MAGIC_MAP_SIZE; y++)	367	for (int y = 0; y < MAGIC_MAP_SIZE; y++)
623	if (map_mark[x + MAP_WIDTH (pl->map) * y] \| FACE_FLOOR)	368	if (map_mark[x + pl->map->width * y] \| FACE_FLOOR)
624	{	369	{
625	xmin = x < xmin ? x : xmin;	370	xmin = x < xmin ? x : xmin;
626	xmax = x > xmax ? x : xmax;	371	xmax = x > xmax ? x : xmax;
627	ymin = y < ymin ? y : ymin;	372	ymin = y < ymin ? y : ymin;
628	ymax = y > ymax ? y : ymax;	373	ymax = y > ymax ? y : ymax;
…		…
634		379
635	for (int y = ymin; y <= ymax; y++)	380	for (int y = ymin; y <= ymax; y++)
636	for (int x = xmin; x <= xmax; x++)	381	for (int x = xmin; x <= xmax; x++)
637	sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);	382	sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
638		383
639	Send_With_Handling (pl->contr->socket, &sl);	384	pl->contr->ns->send_packet (sl);
640		385
641	free (map_mark);	386	free (map_mark);
642	}	387	}
643		388
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.59 by root, Fri Mar 26 00:59:22 2010 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.59 by root, Fri Mar 26 00:59:22 2010 UTC