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

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

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.15 by root, Thu Dec 14 01:21:58 2006 UTC vs. Revision 1.60 by root, Fri Mar 26 01:04:45 2010 UTC

Diff Legend

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.15 by root, Thu Dec 14 01:21:58 2006 UTC vs.
Revision 1.60 by root, Fri Mar 26 01:04:45 2010 UTC