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

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.34 by pippijn, Thu Mar 1 12:28:17 2007 UTC vs.
Revision 1.60 by root, Fri Mar 26 01:04:45 2010 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.34 by pippijn, Thu Mar 1 12:28:17 2007 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.34 by pippijn, Thu Mar 1 12:28:17 2007 UTC vs.
Revision 1.60 by root, Fri Mar 26 01:04:45 2010 UTC