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

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.14 by root, Thu Dec 14 01:12:35 2006 UTC vs.
Revision 1.37 by root, Tue Apr 24 12:32:16 2007 UTC

…		…
1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
4		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
7		7	*
8	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	(at your option) any later version.	11	* (at your 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 GNU General Public License
19	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		21	*
22	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	/**	25	/**
26	* \file	26	* \file
27	* Basic client output functions.	27	* Basic client output functions.
28	*	28	*
43	* much the same thing as the draw_info above, but takes a color	43	* much the same thing as the draw_info above, but takes a color
44	* parameter. the esrv_drawinfo functions should probably be	44	* parameter. the esrv_drawinfo functions should probably be
45	* replaced with this, just using black as the color.	45	* replaced with this, just using black as the color.
46	*/	46	*/
47	static void	47	static void
48	esrv_print_msg (NewSocket * ns, int color, const char *str)	48	esrv_print_msg (client ns, int color, const char str)
49	{	49	{
50	SockList sl (MAXSOCKBUF);
51
52	if (ns->status == Ns_Old)
53	sl.printf ("%s\n", str);
54	else
55	sl.printf ("drawinfo %d %s", color, str);	50	ns->send_packet_printf ("drawinfo %d %s", color, str);
56
57	ns->send_packet (sl);
58	sl.free ();
59	}	51	}
60		52
61	/**	53	/**
62	* Draws an extended message on the client.	54	* Draws an extended message on the client.
63	* ns the socket to send message to	55	* ns the socket to send message to
…		…
66	* subtype type and subtype of text message	58	* subtype type and subtype of text message
67	* intro Intro message to send with main message if client does not support the message type	59	* intro Intro message to send with main message if client does not support the message type
68	* message The main message	60	* message The main message
69	*/	61	*/
70	static void	62	static void
71	esrv_print_ext_msg (NewSocket * ns, int color, uint8 type, uint8 subtype, const char *message)	63	esrv_print_ext_msg (client ns, int color, uint8 type, uint8 subtype, const char message)
72	{	64	{
73	SockList sl (MAXSOCKBUF);
74
75	sl.printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);	65	ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
76	ns->send_packet (sl);
77	sl.free ();
78	}	66	}
79		67
80	/**	68	/**
81	* Frontend for esrv_print_msg	69	* Frontend for esrv_print_msg
82	* \param colr message color	70	* \param colr message color
…		…
85	*	73	*
86	* If pl is NULL or without contr set, writes message to log.	74	* If pl is NULL or without contr set, writes message to log.
87	*	75	*
88	* Else sends message to player via esrv_print_msg	76	* Else sends message to player via esrv_print_msg
89	*/	77	*/
90
91	static void	78	static void
92	print_message (int colr, const object pl, const char tmp)	79	print_message (int colr, const object pl, const char tmp)
93	{	80	{
94
95	if (!tmp)	81	if (!tmp)
96	tmp = "[NULL]";	82	tmp = "[NULL]";
97		83
98	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))	84	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))
99	return;	85	return;
100		86
101	if (pl->type == PLAYER)	87	if (pl->type == PLAYER)
102	{
103	esrv_print_msg (&pl->contr->socket, colr, (char *) tmp);	88	esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
104	return;
105	}
106	}	89	}
107		90
108	/**	91	/**
109	* Prints out the contents of specified buffer structures,	92	* Prints out the contents of specified buffer structures,
110	* and clears the string.	93	* and clears the string.
111	*/	94	*/
112
113	void	95	void
114	flush_output_element (const object pl, Output_Buf outputs)	96	flush_output_element (const object pl, Output_Buf outputs)
115	{	97	{
116	char tbuf[MAX_BUF];	98	char tbuf[MAX_BUF];
117		99
…		…
141	* If found, checks if message should be sent now.	123	* If found, checks if message should be sent now.
142	*	124	*
143	* If message not already in buffers, flushes olders buffer,	125	* If message not already in buffers, flushes olders buffer,
144	* and adds message to queue.	126	* and adds message to queue.
145	*/	127	*/
146
147	static void	128	static void
148	check_output_buffers (const object pl, const char buf)	129	check_output_buffers (const object pl, const char buf)
149	{	130	{
150	int i, oldest = 0;	131	int i, oldest = 0;
151		132
…		…
182	pl->contr->outputs[oldest].buf = buf;	163	pl->contr->outputs[oldest].buf = buf;
183	}	164	}
184	}	165	}
185	}	166	}
186		167
187
188
189	/**	168	/**
190	* Sends message to player(s).	169	* Sends message to player(s).
191	*	170	*
192	* flags is various flags - mostly color, plus a few specials.	171	* flags is various flags - mostly color, plus a few specials.
193	*	172	*
…		…
204	*/	183	*/
205		184
206	void	185	void
207	new_draw_info (int flags, int pri, const object pl, const char buf)	186	new_draw_info (int flags, int pri, const object pl, const char buf)
208	{	187	{
209
210	if (flags & NDI_ALL)	188	if (flags & NDI_ALL)
211	{	189	{
212	player *tmppl;	190	for_all_players (pl)
213
214	for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
215	new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);	191	new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
216		192
217	return;	193	return;
218	}	194	}
219		195
220	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))	196	if (!pl \|\| pl->type != PLAYER \|\| !pl->contr \|\| !pl->contr->ns)
221	{
222	/* Write to the socket? */
223	print_message (0, NULL, buf);
224	return;
225	}
226
227	if (pl->type != PLAYER)
228	return;	197	return;
229		198
230	if (pri >= pl->contr->listening)	199	if (pri >= pl->contr->listening)
231	return;	200	return;
232		201
233	if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))	202	if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
234	/* following prints stuff out, as appropriate */
235	check_output_buffers (pl, buf);	203	check_output_buffers (pl, buf);
236	else	204	else
237	print_message (flags & NDI_COLOR_MASK, pl, buf);	205	print_message (flags & NDI_COLOR_MASK, pl, buf);
238	}	206	}
239		207
…		…
243	* This is a pretty trivial function, but it allows us to use printf style	211	* This is a pretty trivial function, but it allows us to use printf style
244	* formatting, so instead of the calling function having to do it, we do	212	* formatting, so instead of the calling function having to do it, we do
245	* it here. It may also have advantages in the future for reduction of	213	* it here. It may also have advantages in the future for reduction of
246	* client/server bandwidth (client could keep track of various strings	214	* client/server bandwidth (client could keep track of various strings
247	*/	215	*/
248
249	void	216	void
250	new_draw_info_format (int flags, int pri, const object pl, const char format, ...)	217	new_draw_info_format (int flags, int pri, const object pl, const char format, ...)
251	{	218	{
252	char buf[HUGE_BUF];	219	char buf[HUGE_BUF];
253		220
254	va_list ap;	221	va_list ap;
255
256	va_start (ap, format);	222	va_start (ap, format);
257
258	vsnprintf (buf, HUGE_BUF, format, ap);	223	vsnprintf (buf, HUGE_BUF, format, ap);
259
260	va_end (ap);	224	va_end (ap);
261		225
262	new_draw_info (flags, pri, pl, buf);	226	new_draw_info (flags, pri, pl, buf);
263	}	227	}
264		228
265
266	void	229	void
267	draw_ext_info (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char message, const char *oldmessage)	230	draw_ext_info (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char message, const char *oldmessage)
268	{	231	{
269		232
270	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))	233	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
271	return;	234	return;
272		235
273	if (pri >= pl->contr->listening)	236	if (pri >= pl->contr->listening)
274	return;	237	return;
		238
275	if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type))	239	if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
276	{	240	{
277	char buf = (char ) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);	241	char buf = (char ) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
278		242
279	if (buf == NULL)	243	if (buf == NULL)
280	LOG (llevError, "info::draw_ext_info -> Out of memory!");	244	LOG (llevError, "info::draw_ext_info -> Out of memory!");
…		…
285	new_draw_info (flags, pri, pl, buf);	249	new_draw_info (flags, pri, pl, buf);
286	free (buf);	250	free (buf);
287	}	251	}
288	}	252	}
289	else	253	else
290	{
291	esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message);	254	esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
292	}
293	}	255	}
294		256
295	void	257	void
296	draw_ext_info_format (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char old_format, char *new_format, ...)	258	draw_ext_info_format (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char old_format, char *new_format, ...)
297	{	259	{
298
299	char buf[HUGE_BUF];	260	char buf[HUGE_BUF];
300		261
301	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))	262	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
302	return;	263	return;
303		264
304	if (pri >= pl->contr->listening)	265	if (pri >= pl->contr->listening)
305	return;	266	return;
		267
306	if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type))	268	if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
307	{	269	{
308	va_list ap;	270	va_list ap;
309		271
310	LOG (llevDebug, "Non supported extension text type for client.\n");	272	LOG (llevDebug, "Non supported extension text type for client.\n");
311	va_start (ap, new_format);	273	va_start (ap, new_format);
…		…
320		282
321	va_start (ap, new_format);	283	va_start (ap, new_format);
322	vsnprintf (buf, HUGE_BUF, new_format, ap);	284	vsnprintf (buf, HUGE_BUF, new_format, ap);
323	va_end (ap);	285	va_end (ap);
324	strip_media_tag (buf);	286	strip_media_tag (buf);
325	esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf);	287	esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
326	}	288	}
327	}	289	}
328		290
329	/**	291	/**
330	* Writes to everyone on the map except op. This is useful for emotions.	292	* Writes to everyone on the map except op. This is useful for emotions.
331	*/	293	*/
332		294
333	void	295	void
334	new_info_map_except (int color, maptile * map, object op, const char str)	296	new_info_map_except (int color, maptile * map, object op, const char str)
335	{	297	{
336	player *pl;	298	for_all_players (pl)
337
338	for (pl = first_player; pl != NULL; pl = pl->next)
339	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)	299	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
340	{
341	new_draw_info (color, 0, pl->ob, str);	300	new_draw_info (color, 0, pl->ob, str);
342	}
343	}	301	}
344		302
345	/**	303	/**
346	* Writes to everyone on the map except op1 and op2	304	* Writes to everyone on the map except op1 and op2
347	*/	305	*/
348		306
349	void	307	void
350	new_info_map_except2 (int color, maptile * map, object op1, object op2, const char *str)	308	new_info_map_except2 (int color, maptile * map, object op1, object op2, const char *str)
351	{	309	{
352	player *pl;	310	for_all_players (pl)
353
354	for (pl = first_player; pl != NULL; pl = pl->next)
355	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)	311	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
356	{
357	new_draw_info (color, 0, pl->ob, str);	312	new_draw_info (color, 0, pl->ob, str);
358	}
359	}	313	}
360		314
361	/**	315	/**
362	* Writes to everyone on the specified map	316	* Writes to everyone on the specified map
363	*/	317	*/
364		318
365	void	319	void
366	new_info_map (int color, maptile * map, const char *str)	320	new_info_map (int color, maptile * map, const char *str)
367	{	321	{
368	player *pl;	322	for_all_players (pl)
369
370	for (pl = first_player; pl != NULL; pl = pl->next)
371	if (pl->ob != NULL && pl->ob->map == map)	323	if (pl->ob != NULL && pl->ob->map == map)
372	{
373	new_draw_info (color, 0, pl->ob, str);	324	new_draw_info (color, 0, pl->ob, str);
374	}
375	}	325	}
376
377		326
378	/**	327	/**
379	* This does nothing now. However, in theory, we should probably send	328	* This does nothing now. However, in theory, we should probably send
380	* something to the client and let the client figure out how it might want	329	* something to the client and let the client figure out how it might want
381	* to handle this	330	* to handle this
…		…
435		384
436	/* range_scroll is only used for controlling golems. If the	385	/* range_scroll is only used for controlling golems. If the
437	* the player does not have a golem, reset some things.	386	* the player does not have a golem, reset some things.
438	*/	387	*/
439	case range_golem:	388	case range_golem:
440	if (pl->contr->ranges[range_golem] != NULL)	389	if (object *golem = pl->contr->ranges[range_golem])
441	sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name);	390	sprintf (obuf, "Range: golem (%s)", &golem->name);
442	else	391	else
443	{	392	{
444	pl->contr->shoottype = range_none;	393	pl->contr->shoottype = range_none;
445	strcpy (obuf, "Range: nothing");	394	strcpy (obuf, "Range: nothing");
446	}	395	}
…		…
470	sprintf (buf, "Player: %s the %s", (const char ) pl->name, (const char ) pl->contr->title);	419	sprintf (buf, "Player: %s the %s", (const char ) pl->name, (const char ) pl->contr->title);
471	else	420	else
472	sprintf (buf, "Player: %s %s", (const char ) pl->name, (const char ) pl->contr->own_title);	421	sprintf (buf, "Player: %s %s", (const char ) pl->name, (const char ) pl->contr->own_title);
473	}	422	}
474		423
		424	// formerly a macro, used only by magic map, so optimised it out
		425	static inline faceidx
		426	GET_MAP_FACE (maptile *m, int x, int y, int layer)
		427	{
		428	if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer))
		429	return op->face;
		430	else
		431	return 0;
		432	}
475		433
476	/**	434	/**
477	* Helper for magic map creation.	435	* Helper for magic map creation.
478	*	436	*
479	* Takes a player, the map_mark array and an x and y starting position.	437	* Takes a player, the map_mark array and an x and y starting position.
…		…
488	magic_mapping_mark_recursive (object pl, char map_mark, int px, int py)	446	magic_mapping_mark_recursive (object pl, char map_mark, int px, int py)
489	{	447	{
490	int x, y, dx, dy, mflags;	448	int x, y, dx, dy, mflags;
491	sint16 nx, ny;	449	sint16 nx, ny;
492	maptile *mp;	450	maptile *mp;
493	New_Face *f;
494		451
495	for (dx = -1; dx <= 1; dx++)	452	for (dx = -1; dx <= 1; dx++)
496	{	453	{
497	for (dy = -1; dy <= 1; dy++)	454	for (dy = -1; dy <= 1; dy++)
498	{	455	{
…		…
510	if (mflags & P_OUT_OF_MAP)	467	if (mflags & P_OUT_OF_MAP)
511	continue;	468	continue;
512		469
513	if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)	470	if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
514	{	471	{
515	f = GET_MAP_FACE (mp, nx, ny, 0);	472	int f = GET_MAP_FACE (mp, nx, ny, 0);
516	if (f == blank_face)	473	if (f == blank_face)
		474	{
517	f = GET_MAP_FACE (mp, nx, ny, 1);	475	f = GET_MAP_FACE (mp, nx, ny, 1);
518	if (f == blank_face)	476	if (f == blank_face)
519	f = GET_MAP_FACE (mp, nx, ny, 2);	477	f = GET_MAP_FACE (mp, nx, ny, 2);
		478	}
		479
		480	int magicmap = faces [f].magicmap;
520		481
521	/* Should probably have P_NO_MAGIC here also, but then shops don't	482	/* Should probably have P_NO_MAGIC here also, but then shops don't
522	* work.	483	* work.
523	*/	484	*/
524	if (mflags & P_BLOCKSVIEW)	485	if (mflags & P_BLOCKSVIEW)
525	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| (f ? f->magicmap : 0);	486	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| magicmap;
526	else	487	else
527	{	488	{
528	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| (f ? f->magicmap : 0);	489	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| magicmap;
529	magic_mapping_mark_recursive (pl, map_mark, x, y);	490	magic_mapping_mark_recursive (pl, map_mark, x, y);
530	}	491	}
531	}	492	}
532	}	493	}
533	}	494	}
534	}	495	}
535
536		496
537	/**	497	/**
538	* Creates magic map for player.	498	* Creates magic map for player.
539	*	499	*
540	* Note: For improved magic mapping display, the space that blocks	500	* Note: For improved magic mapping display, the space that blocks
…		…
542	* being nonzero have been changed to check for 1. Also, since	502	* being nonzero have been changed to check for 1. Also, since
543	* map_mark is a char value, putting 2 in should cause no problems.	503	* map_mark is a char value, putting 2 in should cause no problems.
544	*	504	*
545	* This function examines the map the player is on, and determines what	505	* This function examines the map the player is on, and determines what
546	* is visible. 2 is set for walls or objects that blocks view. 1	506	* is visible. 2 is set for walls or objects that blocks view. 1
547	* is for open spaces. map_mark should already have been initialized	507	* is for open spaces. map_mark should already have been initialised
548	* to zero before this is called.	508	* to zero before this is called.
549	* strength is an initial strength*2 rectangular area that we automatically	509	* strength is an initial strength*2 rectangular area that we automatically
550	* see in/penetrate through.	510	* see in/penetrate through.
551	*/	511	*/
552
553	void	512	void
554	magic_mapping_mark (object pl, char map_mark, int strength)	513	magic_mapping_mark (object pl, char map_mark, int strength)
555	{	514	{
556	int x, y, mflags;	515	int x, y, mflags;
557	sint16 nx, ny;	516	sint16 nx, ny;
558	maptile *mp;	517	maptile *mp;
559	New_Face *f;
560		518
561	for (x = -strength; x < strength; x++)	519	for (x = -strength; x < strength; x++)
562	{	520	{
563	for (y = -strength; y < strength; y++)	521	for (y = -strength; y < strength; y++)
564	{	522	{
565	mp = pl->map;	523	mp = pl->map;
566	nx = pl->x + x;	524	nx = pl->x + x;
567	ny = pl->y + y;	525	ny = pl->y + y;
		526
568	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	527	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
569	if (mflags & P_OUT_OF_MAP)	528	if (mflags & P_OUT_OF_MAP)
570	continue;	529	continue;
571	else	530
		531	int f = GET_MAP_FACE (mp, nx, ny, 0);
		532	if (f == blank_face)
572	{	533	{
573	f = GET_MAP_FACE (mp, nx, ny, 0);
574	if (f == blank_face)
575	f = GET_MAP_FACE (mp, nx, ny, 1);	534	f = GET_MAP_FACE (mp, nx, ny, 1);
576	if (f == blank_face)	535	if (f == blank_face)
577	f = GET_MAP_FACE (mp, nx, ny, 2);	536	f = GET_MAP_FACE (mp, nx, ny, 2);
578	}	537	}
579		538
		539	int magicmap = faces [f].magicmap;
		540
580	if (mflags & P_BLOCKSVIEW)	541	if (mflags & P_BLOCKSVIEW)
581	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| (f ? f->magicmap : 0);	542	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| magicmap;
582	else	543	else
583	{	544	{
584	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| (f ? f->magicmap : 0);	545	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| magicmap;
585	magic_mapping_mark_recursive (pl, map_mark, x, y);	546	magic_mapping_mark_recursive (pl, map_mark, x, y);
586	}	547	}
587	}	548	}
588	}	549	}
589	}	550	}
590		551
591
592	/**	552	/**
593	* Creates and sends magic map to player.	553	* Creates and sends magic map to player.
594	*	554	*
595	* The following function is a lot messier than it really should be,	555	* The following function is a lot messier than it really should be,
596	* but there is no real easy solution.	556	* but there is no real easy solution.
597	*	557	*
598	* Mark Wedel	558	* Mark Wedel
599	*/	559	*/
600
601	void	560	void
602	draw_magic_map (object *pl)	561	draw_magic_map (object *pl)
603	{	562	{
604	char map_mark = (char )calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);	563	char map_mark = (char )calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
605	int xmin, xmax, ymin, ymax;	564	int xmin, xmax, ymin, ymax;
…		…
623	xmax = 0;	582	xmax = 0;
624	ymax = 0;	583	ymax = 0;
625		584
626	for (int x = 0; x < MAGIC_MAP_SIZE; x++)	585	for (int x = 0; x < MAGIC_MAP_SIZE; x++)
627	for (int y = 0; y < MAGIC_MAP_SIZE; y++)	586	for (int y = 0; y < MAGIC_MAP_SIZE; y++)
628	if (map_mark[x + MAP_WIDTH (pl->map) * y] \| FACE_FLOOR)	587	if (map_mark[x + pl->map->width * y] \| FACE_FLOOR)
629	{	588	{
630	xmin = x < xmin ? x : xmin;	589	xmin = x < xmin ? x : xmin;
631	xmax = x > xmax ? x : xmax;	590	xmax = x > xmax ? x : xmax;
632	ymin = y < ymin ? y : ymin;	591	ymin = y < ymin ? y : ymin;
633	ymax = y > ymax ? y : ymax;	592	ymax = y > ymax ? y : ymax;
634	}	593	}
635		594
636	SockList sl (MAXSOCKBUF);	595	packet sl;
637	sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),	596	sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
638	MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);	597	MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
639		598
640	for (int y = ymin; y <= ymax; y++)	599	for (int y = ymin; y <= ymax; y++)
641	for (int x = xmin; x <= xmax; x++)	600	for (int x = xmin; x <= xmax; x++)
642	sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);	601	sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
643		602
644	Send_With_Handling (&pl->contr->socket, &sl);	603	pl->contr->ns->send_packet (sl);
645
646	sl.free ();
647		604
648	free (map_mark);	605	free (map_mark);
649	}	606	}
650		607
651
652	/**	608	/**
653	* Send a kill log record to sockets	609	* Send a kill log record to sockets
654	*/	610	*/
655
656	void	611	void
657	Log_Kill (const char Who, const char What, int WhatType, const char *With, int WithType)	612	Log_Kill (const char Who, const char What, int WhatType, const char *With, int WithType)
658	{	613	{
659	size_t len;	614	size_t len;
660	char buf[MAX_BUF];	615	char buf[MAX_BUF];
…		…
664	else	619	else
665	snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);	620	snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
666		621
667	len = strlen (buf);	622	len = strlen (buf);
668	}	623	}
		624

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.14 by root, Thu Dec 14 01:12:35 2006 UTC vs. Revision 1.37 by root, Tue Apr 24 12:32:16 2007 UTC

Diff Legend

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.14 by root, Thu Dec 14 01:12:35 2006 UTC vs.
Revision 1.37 by root, Tue Apr 24 12:32:16 2007 UTC