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

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.11 by root, Wed Sep 20 21:53:50 2006 UTC vs.
Revision 1.57 by root, Fri Nov 6 13:11: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	int i;
220
221	for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
222	new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);	159	new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf);
223
224	return;
225	}
226
227	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))
228	{	160	}
229	/* Write to the socket? */
230	print_message (0, NULL, buf);
231	return;
232	}
233
234	if (pl->type != PLAYER)
235	return;
236
237	if (pri >= pl->contr->listening)
238	return;
239
240	if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
241	/* following prints stuff out, as appropriate */
242	check_output_buffers (pl, buf);
243	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))
244	print_message (flags & NDI_COLOR_MASK, pl, buf);	168	print_message (flags & NDI_COLOR_MASK, op, buf);
		169	}
245	}	170	}
246		171
247	/**	172	/**
248	* Wrapper for new_draw_info printf-like.	173	* Wrapper for new_draw_info printf-like.
249	*	174	*
250	* 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
251	* 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
252	* 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
253	* client/server bandwidth (client could keep track of various strings	178	* client/server bandwidth (client could keep track of various strings
254	*/	179	*/
255
256	void	180	void
257	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, ...)
258	{	182	{
259	char buf[HUGE_BUF];
260
261	va_list ap;	183	va_list ap;
262
263	va_start (ap, format);	184	va_start (ap, format);
264		185	new_draw_info (flags, pri, pl, vformat (format, ap));
265	vsnprintf (buf, HUGE_BUF, format, ap);
266
267	va_end (ap);	186	va_end (ap);
268
269	new_draw_info (flags, pri, pl, buf);
270	}
271
272
273	void
274	draw_ext_info (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char message, const char *oldmessage)
275	{
276
277	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
278	return;
279
280	if (pri >= pl->contr->listening)
281	return;
282	if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type))
283	{
284	char buf = (char ) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
285
286	if (buf == NULL)
287	LOG (llevError, "info::draw_ext_info -> Out of memory!");
288	else
289	{
290	strcpy (buf, oldmessage == NULL ? message : oldmessage);
291	strip_media_tag (buf);
292	new_draw_info (flags, pri, pl, buf);
293	free (buf);
294	}
295	}
296	else
297	{
298	esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message);
299	}
300	}
301
302	void
303	draw_ext_info_format (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char old_format, char *new_format, ...)
304	{
305
306	char buf[HUGE_BUF];
307
308	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
309	return;
310
311	if (pri >= pl->contr->listening)
312	return;
313	if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type))
314	{
315	va_list ap;
316
317	LOG (llevDebug, "Non supported extension text type for client.\n");
318	va_start (ap, new_format);
319	vsnprintf (buf, HUGE_BUF, old_format, ap);
320	va_end (ap);
321	new_draw_info (flags, pri, pl, buf);
322	return;
323	}
324	else
325	{
326	va_list ap;
327
328	va_start (ap, new_format);
329	vsnprintf (buf, HUGE_BUF, new_format, ap);
330	va_end (ap);
331	strip_media_tag (buf);
332	esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf);
333	}
334	}	187	}
335		188
336	/**	189	/**
337	* Writes to everyone on the map except op. This is useful for emotions.	190	* Writes to everyone on the map except op. This is useful for emotions.
338	*/	191	*/
339
340	void	192	void
341	new_info_map_except (int color, maptile * map, object op, const char str)	193	new_info_map_except (int color, maptile * map, object op, const char str)
342	{	194	{
343	player *pl;	195	for_all_players (pl)
344
345	for (pl = first_player; pl != NULL; pl = pl->next)
346	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)	196	if (pl->ob->map == map && pl->ob != op)
347	{
348	new_draw_info (color, 0, pl->ob, str);	197	new_draw_info (color, 0, pl->ob, str);
349	}
350	}	198	}
351		199
352	/**	200	/**
353	* Writes to everyone on the map except op1 and op2	201	* Writes to everyone on the map except op1 and op2
354	*/	202	*/
355		203	static void
356	void
357	new_info_map_except2 (int color, maptile * map, object op1, object op2, const char *str)	204	new_info_map_except2 (int color, maptile * map, object op1, object op2, const char *str)
358	{	205	{
359	player *pl;	206	for_all_players (pl)
360
361	for (pl = first_player; pl != NULL; pl = pl->next)
362	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)	207	if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
363	{
364	new_draw_info (color, 0, pl->ob, str);	208	new_draw_info (color, 0, pl->ob, str);
365	}
366	}	209	}
367		210
368	/**	211	/**
369	* Writes to everyone on the specified map	212	* Writes to everyone on the specified map
370	*/	213	*/
371
372	void	214	void
373	new_info_map (int color, maptile * map, const char *str)	215	new_info_map (int color, maptile * map, const char *str)
374	{	216	{
375	player *pl;	217	for_all_players (pl)
376
377	for (pl = first_player; pl != NULL; pl = pl->next)
378	if (pl->ob != NULL && pl->ob->map == map)	218	if (pl->ob->map == map)
379	{
380	new_draw_info (color, 0, pl->ob, str);	219	new_draw_info (color, 0, pl->ob, str);
381	}
382	}
383
384
385	/**
386	* This does nothing now. However, in theory, we should probably send
387	* something to the client and let the client figure out how it might want
388	* to handle this
389	*/
390	void
391	clear_win_info (object *op)
392	{
393	}
394
395	/**
396	* Get player's current range attack in obuf.
397	*/
398	void
399	rangetostring (object pl, char obuf)
400	{
401	switch (pl->contr->shoottype)
402	{
403	case range_none:
404	strcpy (obuf, "Range: nothing");
405	break;
406
407	case range_bow:
408	{
409	object *op;
410
411	for (op = pl->inv; op; op = op->below)
412	if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED))
413	break;
414
415	if (op == NULL)
416	break;
417
418	sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing");
419	}
420	break;
421
422	case range_magic:
423	if (settings.casting_time == TRUE)
424	{
425	if (pl->casting_time > -1)
426	{
427	if (pl->casting_time == 0)
428	sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name);
429	else
430	sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name);
431	}
432	else
433	sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
434	}
435	else
436	sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name);
437	break;
438
439	case range_misc:
440	sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none");
441	break;
442
443	/* range_scroll is only used for controlling golems. If the
444	* the player does not have a golem, reset some things.
445	*/
446	case range_golem:
447	if (pl->contr->ranges[range_golem] != NULL)
448	sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);
449	else
450	{
451	pl->contr->shoottype = range_none;
452	strcpy (obuf, "Range: nothing");
453	}
454	break;
455
456	case range_skill:
457	sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none");
458	break;
459
460	case range_builder:
461	sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0));
462	break;
463
464	default:
465	strcpy (obuf, "Range: illegal");
466	}
467	}	220	}
468		221
469	/**	222	/**
470	* Sets player title.	223	* Sets player title.
471	*/	224	*/
…		…
477	sprintf (buf, "Player: %s the %s", (const char ) pl->name, (const char ) pl->contr->title);	230	sprintf (buf, "Player: %s the %s", (const char ) pl->name, (const char ) pl->contr->title);
478	else	231	else
479	sprintf (buf, "Player: %s %s", (const char ) pl->name, (const char ) pl->contr->own_title);	232	sprintf (buf, "Player: %s %s", (const char ) pl->name, (const char ) pl->contr->own_title);
480	}	233	}
481		234
		235	// formerly a macro, used only by magic map, so optimised it out
		236	static inline faceidx
		237	GET_MAP_FACE (mapspace &ms, int layer)
		238	{
		239	if (object *op = ms.faces_obj [layer])
		240	return op->face;
		241	else
		242	return 0;
		243	}
482		244
483	/**	245	/**
484	* Helper for magic map creation.	246	* Helper for magic map creation.
485	*	247	*
486	* Takes a player, the map_mark array and an x and y starting position.	248	* Takes a player, the map_mark array and an x and y starting position.
…		…
492	* for various code values.	254	* for various code values.
493	*/	255	*/
494	static void	256	static void
495	magic_mapping_mark_recursive (object pl, char map_mark, int px, int py)	257	magic_mapping_mark_recursive (object pl, char map_mark, int px, int py)
496	{	258	{
497	int x, y, dx, dy, mflags;
498	sint16 nx, ny;
499	maptile *mp;
500	New_Face *f;
501
502	for (dx = -1; dx <= 1; dx++)	259	for (int dx = -1; dx <= 1; dx++)
503	{	260	{
504	for (dy = -1; dy <= 1; dy++)	261	for (int dy = -1; dy <= 1; dy++)
505	{	262	{
506	x = px + dx;	263	int x = px + dx;
507	y = py + dy;	264	int y = py + dy;
508		265
509	if (FABS (x) >= MAGIC_MAP_HALF \|\| FABS (y) >= MAGIC_MAP_HALF)	266	if (abs (x) >= MAGIC_MAP_HALF \|\| abs (y) >= MAGIC_MAP_HALF)
510	continue;	267	continue;
511		268
512	mp = pl->map;	269	mapxy pos (pl);
513	nx = pl->x + x;	270	pos.move (x, y);
514	ny = pl->y + y;
515		271
516	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	272	if (!pos.normalise ())
517	if (mflags & P_OUT_OF_MAP)
518	continue;	273	continue;
		274
		275	mapspace &ms = pos.ms ();
519		276
520	if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)	277	if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
521	{	278	{
		279	int mflags = ms.flags ();
		280
522	f = GET_MAP_FACE (mp, nx, ny, 0);	281	int f = GET_MAP_FACE (ms, 0);
523	if (f == blank_face)	282	if (f == blank_face)
		283	{
524	f = GET_MAP_FACE (mp, nx, ny, 1);	284	f = GET_MAP_FACE (ms, 1);
525	if (f == blank_face)	285	if (f == blank_face)
526	f = GET_MAP_FACE (mp, nx, ny, 2);	286	f = GET_MAP_FACE (ms, 2);
		287	}
		288
		289	int magicmap = faces [f].magicmap;
527		290
528	/* Should probably have P_NO_MAGIC here also, but then shops don't	291	/* Should probably have P_NO_MAGIC here also, but then shops don't
529	* work.	292	* work.
530	*/	293	*/
531	if (mflags & P_BLOCKSVIEW)	294	if (mflags & P_BLOCKSVIEW)
532	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| (f ? f->magicmap : 0);	295	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| magicmap;
533	else	296	else
534	{	297	{
535	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| (f ? f->magicmap : 0);	298	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| magicmap;
536	magic_mapping_mark_recursive (pl, map_mark, x, y);	299	magic_mapping_mark_recursive (pl, map_mark, x, y);
537	}	300	}
538	}	301	}
539	}	302	}
540	}	303	}
541	}	304	}
542		305
543
544	/**	306	/**
545	* Creates magic map for player.	307	* Creates magic map for player.
546	*	308	*
547	* Note: For improved magic mapping display, the space that blocks	309	* Note: For improved magic mapping display, the space that blocks
548	* the view is now marked with value 2. Any dependencies of map_mark	310	* the view is now marked with value 2. Any dependencies of map_mark
549	* being nonzero have been changed to check for 1. Also, since	311	* being nonzero have been changed to check for 1. Also, since
550	* map_mark is a char value, putting 2 in should cause no problems.	312	* map_mark is a char value, putting 2 in should cause no problems.
551	*	313	*
552	* This function examines the map the player is on, and determines what	314	* This function examines the map the player is on, and determines what
553	* is visible. 2 is set for walls or objects that blocks view. 1	315	* is visible. 2 is set for walls or objects that blocks view. 1
554	* is for open spaces. map_mark should already have been initialized	316	* is for open spaces. map_mark should already have been initialised
555	* to zero before this is called.	317	* to zero before this is called.
556	* strength is an initial strength*2 rectangular area that we automatically	318	* strength is an initial strength*2 rectangular area that we automatically
557	* see in/penetrate through.	319	* see in/penetrate through.
558	*/	320	*/
559		321	static void
560	void
561	magic_mapping_mark (object pl, char map_mark, int strength)	322	magic_mapping_mark (object pl, char map_mark, int strength)
562	{	323	{
563	int x, y, mflags;
564	sint16 nx, ny;
565	maptile *mp;
566	New_Face *f;
567
568	for (x = -strength; x < strength; x++)	324	for (int x = -strength; x < strength; x++)
569	{	325	{
570	for (y = -strength; y < strength; y++)	326	for (int y = -strength; y < strength; y++)
571	{	327	{
572	mp = pl->map;	328	mapxy pos (pl);
573	nx = pl->x + x;	329	pos.move (x, y);
574	ny = pl->y + y;	330
575	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	331	if (!pos.normalise ())
576	if (mflags & P_OUT_OF_MAP)
577	continue;	332	continue;
		333
		334	mapspace &ms = pos.ms ();
		335
		336	int mflags = ms.flags ();
		337
		338	int f = GET_MAP_FACE (ms, 0);
		339	if (f == blank_face)
		340	{
		341	f = GET_MAP_FACE (ms, 1);
		342	if (f == blank_face)
		343	f = GET_MAP_FACE (ms, 2);
		344	}
		345
		346	int magicmap = faces [f].magicmap;
		347
		348	if (mflags & P_BLOCKSVIEW)
		349	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| magicmap;
578	else	350	else
579	{	351	{
580	f = GET_MAP_FACE (mp, nx, ny, 0);
581	if (f == blank_face)
582	f = GET_MAP_FACE (mp, nx, ny, 1);
583	if (f == blank_face)
584	f = GET_MAP_FACE (mp, nx, ny, 2);
585	}
586
587	if (mflags & P_BLOCKSVIEW)
588	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| (f ? f->magicmap : 0);
589	else
590	{
591	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| (f ? f->magicmap : 0);	352	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| magicmap;
592	magic_mapping_mark_recursive (pl, map_mark, x, y);	353	magic_mapping_mark_recursive (pl, map_mark, x, y);
593	}	354	}
594	}	355	}
595	}	356	}
596	}	357	}
597		358
598
599	/**	359	/**
600	* Creates and sends magic map to player.	360	* Creates and sends magic map to player.
601	*	361	*
602	* The following function is a lot messier than it really should be,	362	* The following function is a lot messier than it really should be,
603	* but there is no real easy solution.	363	* but there is no real easy solution.
604	*	364	*
605	* Mark Wedel	365	* Mark Wedel
606	*/	366	*/
607
608	void	367	void
609	draw_magic_map (object *pl)	368	draw_magic_map (object *pl)
610	{	369	{
611	int x, y;
612	char map_mark = (char ) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);	370	char map_mark = (char )calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
613	int xmin, xmax, ymin, ymax;	371	int xmin, xmax, ymin, ymax;
614	SockList sl;
615		372
616	if (pl->type != PLAYER)	373	if (pl->type != PLAYER)
617	{	374	{
618	LOG (llevError, "Non player object called draw_map.\n");	375	LOG (llevError, "Non player object called draw_map.\n");
619	return;	376	return;
…		…
629	*/	386	*/
630	xmin = MAGIC_MAP_SIZE;	387	xmin = MAGIC_MAP_SIZE;
631	ymin = MAGIC_MAP_SIZE;	388	ymin = MAGIC_MAP_SIZE;
632	xmax = 0;	389	xmax = 0;
633	ymax = 0;	390	ymax = 0;
		391
634	for (x = 0; x < MAGIC_MAP_SIZE; x++)	392	for (int x = 0; x < MAGIC_MAP_SIZE; x++)
635	{
636	for (y = 0; y < MAGIC_MAP_SIZE; y++)	393	for (int y = 0; y < MAGIC_MAP_SIZE; y++)
		394	if (map_mark[x + pl->map->width * y] \| FACE_FLOOR)
637	{	395	{
638	if (map_mark[x + MAP_WIDTH (pl->map) * y] \| FACE_FLOOR)
639	{
640	xmin = x < xmin ? x : xmin;	396	xmin = x < xmin ? x : xmin;
641	xmax = x > xmax ? x : xmax;	397	xmax = x > xmax ? x : xmax;
642	ymin = y < ymin ? y : ymin;	398	ymin = y < ymin ? y : ymin;
643	ymax = y > ymax ? y : ymax;	399	ymax = y > ymax ? y : ymax;
644	}
645	}	400	}
646	}
647		401
648	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	402	packet sl;
649	snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),	403	sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
650	MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);	404	MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
651	sl.len = strlen ((char *) sl.buf);
652		405
653	for (y = ymin; y <= ymax; y++)	406	for (int y = ymin; y <= ymax; y++)
654	{
655	for (x = xmin; x <= xmax; x++)	407	for (int x = xmin; x <= xmax; x++)
656	{
657	sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR;	408	sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
658	} /* x loop */
659	} /* y loop */
660		409
661	Send_With_Handling (&pl->contr->socket, &sl);	410	pl->contr->ns->send_packet (sl);
662	free (sl.buf);	411
663	free (map_mark);	412	free (map_mark);
664	}	413	}
665		414
666
667	/**
668	* Send a kill log record to sockets
669	*/
670
671	void
672	Log_Kill (const char Who, const char What, int WhatType, const char *With, int WithType)
673	{
674	int i;
675	size_t len;
676	char buf[MAX_BUF];
677
678	if (With != NULL)
679	snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
680	else
681	snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
682
683	len = strlen (buf);
684	}

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.11 by root, Wed Sep 20 21:53:50 2006 UTC vs. Revision 1.57 by root, Fri Nov 6 13:11:28 2009 UTC

Diff Legend

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.11 by root, Wed Sep 20 21:53:50 2006 UTC vs.
Revision 1.57 by root, Fri Nov 6 13:11:28 2009 UTC