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

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.17 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.35 by root, Sun Mar 11 02:12:45 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 (client_socket * ns, int color, const char *str)	48	esrv_print_msg (client ns, int color, const char str)
49	{	49	{
50	packet sl;
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	}	51	}
59		52
60	/**	53	/**
61	* Draws an extended message on the client.	54	* Draws an extended message on the client.
62	* ns the socket to send message to	55	* ns the socket to send message to
…		…
65	* subtype type and subtype of text message	58	* subtype type and subtype of text message
66	* 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
67	* message The main message	60	* message The main message
68	*/	61	*/
69	static void	62	static void
70	esrv_print_ext_msg (client_socket * 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)
71	{	64	{
72	packet sl;
73
74	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);
75	ns->send_packet (sl);
76	}	66	}
77		67
78	/**	68	/**
79	* Frontend for esrv_print_msg	69	* Frontend for esrv_print_msg
80	* \param colr message color	70	* \param colr message color
…		…
83	*	73	*
84	* 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.
85	*	75	*
86	* Else sends message to player via esrv_print_msg	76	* Else sends message to player via esrv_print_msg
87	*/	77	*/
88
89	static void	78	static void
90	print_message (int colr, const object pl, const char tmp)	79	print_message (int colr, const object pl, const char tmp)
91	{	80	{
92
93	if (!tmp)	81	if (!tmp)
94	tmp = "[NULL]";	82	tmp = "[NULL]";
95		83
96	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))	84	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))
97	return;	85	return;
98		86
99	if (pl->type == PLAYER)	87	if (pl->type == PLAYER)
100	esrv_print_msg (pl->contr->socket, colr, (char *) tmp);	88	esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
101	}	89	}
102		90
103	/**	91	/**
104	* Prints out the contents of specified buffer structures,	92	* Prints out the contents of specified buffer structures,
105	* and clears the string.	93	* and clears the string.
106	*/	94	*/
107
108	void	95	void
109	flush_output_element (const object pl, Output_Buf outputs)	96	flush_output_element (const object pl, Output_Buf outputs)
110	{	97	{
111	char tbuf[MAX_BUF];	98	char tbuf[MAX_BUF];
112		99
…		…
136	* If found, checks if message should be sent now.	123	* If found, checks if message should be sent now.
137	*	124	*
138	* If message not already in buffers, flushes olders buffer,	125	* If message not already in buffers, flushes olders buffer,
139	* and adds message to queue.	126	* and adds message to queue.
140	*/	127	*/
141
142	static void	128	static void
143	check_output_buffers (const object pl, const char buf)	129	check_output_buffers (const object pl, const char buf)
144	{	130	{
145	int i, oldest = 0;	131	int i, oldest = 0;
146		132
…		…
177	pl->contr->outputs[oldest].buf = buf;	163	pl->contr->outputs[oldest].buf = buf;
178	}	164	}
179	}	165	}
180	}	166	}
181		167
182
183
184	/**	168	/**
185	* Sends message to player(s).	169	* Sends message to player(s).
186	*	170	*
187	* flags is various flags - mostly color, plus a few specials.	171	* flags is various flags - mostly color, plus a few specials.
188	*	172	*
…		…
199	*/	183	*/
200		184
201	void	185	void
202	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)
203	{	187	{
204
205	if (flags & NDI_ALL)	188	if (flags & NDI_ALL)
206	{	189	{
207	player *tmppl;	190	for_all_players (pl)
208
209	for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
210	new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);	191	new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
211		192
212	return;	193	return;
213	}	194	}
214		195
215	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))	196	if (!pl \|\| pl->type != PLAYER \|\| !pl->contr \|\| !pl->contr->ns)
216	{
217	/* Write to the socket? */
218	print_message (0, NULL, buf);
219	return;
220	}
221
222	if (pl->type != PLAYER)
223	return;	197	return;
224		198
225	if (pri >= pl->contr->listening)	199	if (pri >= pl->contr->listening)
226	return;	200	return;
227		201
228	if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))	202	if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
229	/* following prints stuff out, as appropriate */
230	check_output_buffers (pl, buf);	203	check_output_buffers (pl, buf);
231	else	204	else
232	print_message (flags & NDI_COLOR_MASK, pl, buf);	205	print_message (flags & NDI_COLOR_MASK, pl, buf);
233	}	206	}
234		207
…		…
238	* 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
239	* 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
240	* 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
241	* client/server bandwidth (client could keep track of various strings	214	* client/server bandwidth (client could keep track of various strings
242	*/	215	*/
243
244	void	216	void
245	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, ...)
246	{	218	{
247	char buf[HUGE_BUF];	219	char buf[HUGE_BUF];
248		220
249	va_list ap;	221	va_list ap;
250
251	va_start (ap, format);	222	va_start (ap, format);
252
253	vsnprintf (buf, HUGE_BUF, format, ap);	223	vsnprintf (buf, HUGE_BUF, format, ap);
254
255	va_end (ap);	224	va_end (ap);
256		225
257	new_draw_info (flags, pri, pl, buf);	226	new_draw_info (flags, pri, pl, buf);
258	}	227	}
259		228
260
261	void	229	void
262	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)
263	{	231	{
264		232
265	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))	233	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
266	return;	234	return;
267		235
268	if (pri >= pl->contr->listening)	236	if (pri >= pl->contr->listening)
269	return;	237	return;
270		238
271	if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))	239	if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
272	{	240	{
273	char buf = (char ) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);	241	char buf = (char ) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
274		242
275	if (buf == NULL)	243	if (buf == NULL)
276	LOG (llevError, "info::draw_ext_info -> Out of memory!");	244	LOG (llevError, "info::draw_ext_info -> Out of memory!");
…		…
281	new_draw_info (flags, pri, pl, buf);	249	new_draw_info (flags, pri, pl, buf);
282	free (buf);	250	free (buf);
283	}	251	}
284	}	252	}
285	else	253	else
286	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);
287	}	255	}
288		256
289	void	257	void
290	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, ...)
291	{	259	{
292
293	char buf[HUGE_BUF];	260	char buf[HUGE_BUF];
294		261
295	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))	262	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
296	return;	263	return;
297		264
298	if (pri >= pl->contr->listening)	265	if (pri >= pl->contr->listening)
299	return;	266	return;
300		267
301	if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))	268	if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
302	{	269	{
303	va_list ap;	270	va_list ap;
304		271
305	LOG (llevDebug, "Non supported extension text type for client.\n");	272	LOG (llevDebug, "Non supported extension text type for client.\n");
306	va_start (ap, new_format);	273	va_start (ap, new_format);
…		…
315		282
316	va_start (ap, new_format);	283	va_start (ap, new_format);
317	vsnprintf (buf, HUGE_BUF, new_format, ap);	284	vsnprintf (buf, HUGE_BUF, new_format, ap);
318	va_end (ap);	285	va_end (ap);
319	strip_media_tag (buf);	286	strip_media_tag (buf);
320	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);
321	}	288	}
322	}	289	}
323		290
324	/**	291	/**
325	* 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.
326	*/	293	*/
327		294
328	void	295	void
329	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)
330	{	297	{
331	player *pl;	298	for_all_players (pl)
332
333	for (pl = first_player; pl != NULL; pl = pl->next)
334	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)	299	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
335	{
336	new_draw_info (color, 0, pl->ob, str);	300	new_draw_info (color, 0, pl->ob, str);
337	}
338	}	301	}
339		302
340	/**	303	/**
341	* Writes to everyone on the map except op1 and op2	304	* Writes to everyone on the map except op1 and op2
342	*/	305	*/
343		306
344	void	307	void
345	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)
346	{	309	{
347	player *pl;	310	for_all_players (pl)
348
349	for (pl = first_player; pl != NULL; pl = pl->next)
350	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)	311	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
351	{
352	new_draw_info (color, 0, pl->ob, str);	312	new_draw_info (color, 0, pl->ob, str);
353	}
354	}	313	}
355		314
356	/**	315	/**
357	* Writes to everyone on the specified map	316	* Writes to everyone on the specified map
358	*/	317	*/
359		318
360	void	319	void
361	new_info_map (int color, maptile * map, const char *str)	320	new_info_map (int color, maptile * map, const char *str)
362	{	321	{
363	player *pl;	322	for_all_players (pl)
364
365	for (pl = first_player; pl != NULL; pl = pl->next)
366	if (pl->ob != NULL && pl->ob->map == map)	323	if (pl->ob != NULL && pl->ob->map == map)
367	{
368	new_draw_info (color, 0, pl->ob, str);	324	new_draw_info (color, 0, pl->ob, str);
369	}
370	}	325	}
371
372		326
373	/**	327	/**
374	* This does nothing now. However, in theory, we should probably send	328	* This does nothing now. However, in theory, we should probably send
375	* something to the client and let the client figure out how it might want	329	* something to the client and let the client figure out how it might want
376	* to handle this	330	* to handle this
…		…
465	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);
466	else	420	else
467	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);
468	}	422	}
469		423
470
471	/**	424	/**
472	* Helper for magic map creation.	425	* Helper for magic map creation.
473	*	426	*
474	* Takes a player, the map_mark array and an x and y starting position.	427	* Takes a player, the map_mark array and an x and y starting position.
475	* pl is the player.	428	* pl is the player.
…		…
483	magic_mapping_mark_recursive (object pl, char map_mark, int px, int py)	436	magic_mapping_mark_recursive (object pl, char map_mark, int px, int py)
484	{	437	{
485	int x, y, dx, dy, mflags;	438	int x, y, dx, dy, mflags;
486	sint16 nx, ny;	439	sint16 nx, ny;
487	maptile *mp;	440	maptile *mp;
488	New_Face *f;
489		441
490	for (dx = -1; dx <= 1; dx++)	442	for (dx = -1; dx <= 1; dx++)
491	{	443	{
492	for (dy = -1; dy <= 1; dy++)	444	for (dy = -1; dy <= 1; dy++)
493	{	445	{
…		…
505	if (mflags & P_OUT_OF_MAP)	457	if (mflags & P_OUT_OF_MAP)
506	continue;	458	continue;
507		459
508	if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)	460	if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
509	{	461	{
510	f = GET_MAP_FACE (mp, nx, ny, 0);	462	int f = GET_MAP_FACE (mp, nx, ny, 0);
511	if (f == blank_face)	463	if (f == blank_face)
		464	{
512	f = GET_MAP_FACE (mp, nx, ny, 1);	465	f = GET_MAP_FACE (mp, nx, ny, 1);
513	if (f == blank_face)	466	if (f == blank_face)
514	f = GET_MAP_FACE (mp, nx, ny, 2);	467	f = GET_MAP_FACE (mp, nx, ny, 2);
		468	}
		469
		470	int magicmap = faces [f].magicmap;
515		471
516	/* Should probably have P_NO_MAGIC here also, but then shops don't	472	/* Should probably have P_NO_MAGIC here also, but then shops don't
517	* work.	473	* work.
518	*/	474	*/
519	if (mflags & P_BLOCKSVIEW)	475	if (mflags & P_BLOCKSVIEW)
520	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| (f ? f->magicmap : 0);	476	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| magicmap;
521	else	477	else
522	{	478	{
523	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| (f ? f->magicmap : 0);	479	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| magicmap;
524	magic_mapping_mark_recursive (pl, map_mark, x, y);	480	magic_mapping_mark_recursive (pl, map_mark, x, y);
525	}	481	}
526	}	482	}
527	}	483	}
528	}	484	}
529	}	485	}
530
531		486
532	/**	487	/**
533	* Creates magic map for player.	488	* Creates magic map for player.
534	*	489	*
535	* Note: For improved magic mapping display, the space that blocks	490	* Note: For improved magic mapping display, the space that blocks
…		…
537	* being nonzero have been changed to check for 1. Also, since	492	* being nonzero have been changed to check for 1. Also, since
538	* map_mark is a char value, putting 2 in should cause no problems.	493	* map_mark is a char value, putting 2 in should cause no problems.
539	*	494	*
540	* This function examines the map the player is on, and determines what	495	* This function examines the map the player is on, and determines what
541	* is visible. 2 is set for walls or objects that blocks view. 1	496	* is visible. 2 is set for walls or objects that blocks view. 1
542	* is for open spaces. map_mark should already have been initialized	497	* is for open spaces. map_mark should already have been initialised
543	* to zero before this is called.	498	* to zero before this is called.
544	* strength is an initial strength*2 rectangular area that we automatically	499	* strength is an initial strength*2 rectangular area that we automatically
545	* see in/penetrate through.	500	* see in/penetrate through.
546	*/	501	*/
547
548	void	502	void
549	magic_mapping_mark (object pl, char map_mark, int strength)	503	magic_mapping_mark (object pl, char map_mark, int strength)
550	{	504	{
551	int x, y, mflags;	505	int x, y, mflags;
552	sint16 nx, ny;	506	sint16 nx, ny;
553	maptile *mp;	507	maptile *mp;
554	New_Face *f;
555		508
556	for (x = -strength; x < strength; x++)	509	for (x = -strength; x < strength; x++)
557	{	510	{
558	for (y = -strength; y < strength; y++)	511	for (y = -strength; y < strength; y++)
559	{	512	{
560	mp = pl->map;	513	mp = pl->map;
561	nx = pl->x + x;	514	nx = pl->x + x;
562	ny = pl->y + y;	515	ny = pl->y + y;
		516
563	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	517	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
564	if (mflags & P_OUT_OF_MAP)	518	if (mflags & P_OUT_OF_MAP)
565	continue;	519	continue;
566	else	520
		521	int f = GET_MAP_FACE (mp, nx, ny, 0);
		522	if (f == blank_face)
567	{	523	{
568	f = GET_MAP_FACE (mp, nx, ny, 0);
569	if (f == blank_face)
570	f = GET_MAP_FACE (mp, nx, ny, 1);	524	f = GET_MAP_FACE (mp, nx, ny, 1);
571	if (f == blank_face)	525	if (f == blank_face)
572	f = GET_MAP_FACE (mp, nx, ny, 2);	526	f = GET_MAP_FACE (mp, nx, ny, 2);
573	}	527	}
574		528
		529	int magicmap = faces [f].magicmap;
		530
575	if (mflags & P_BLOCKSVIEW)	531	if (mflags & P_BLOCKSVIEW)
576	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| (f ? f->magicmap : 0);	532	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL \| magicmap;
577	else	533	else
578	{	534	{
579	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| (f ? f->magicmap : 0);	535	map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR \| magicmap;
580	magic_mapping_mark_recursive (pl, map_mark, x, y);	536	magic_mapping_mark_recursive (pl, map_mark, x, y);
581	}	537	}
582	}	538	}
583	}	539	}
584	}	540	}
585		541
586
587	/**	542	/**
588	* Creates and sends magic map to player.	543	* Creates and sends magic map to player.
589	*	544	*
590	* The following function is a lot messier than it really should be,	545	* The following function is a lot messier than it really should be,
591	* but there is no real easy solution.	546	* but there is no real easy solution.
592	*	547	*
593	* Mark Wedel	548	* Mark Wedel
594	*/	549	*/
595
596	void	550	void
597	draw_magic_map (object *pl)	551	draw_magic_map (object *pl)
598	{	552	{
599	char map_mark = (char )calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);	553	char map_mark = (char )calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
600	int xmin, xmax, ymin, ymax;	554	int xmin, xmax, ymin, ymax;
…		…
618	xmax = 0;	572	xmax = 0;
619	ymax = 0;	573	ymax = 0;
620		574
621	for (int x = 0; x < MAGIC_MAP_SIZE; x++)	575	for (int x = 0; x < MAGIC_MAP_SIZE; x++)
622	for (int y = 0; y < MAGIC_MAP_SIZE; y++)	576	for (int y = 0; y < MAGIC_MAP_SIZE; y++)
623	if (map_mark[x + MAP_WIDTH (pl->map) * y] \| FACE_FLOOR)	577	if (map_mark[x + pl->map->width * y] \| FACE_FLOOR)
624	{	578	{
625	xmin = x < xmin ? x : xmin;	579	xmin = x < xmin ? x : xmin;
626	xmax = x > xmax ? x : xmax;	580	xmax = x > xmax ? x : xmax;
627	ymin = y < ymin ? y : ymin;	581	ymin = y < ymin ? y : ymin;
628	ymax = y > ymax ? y : ymax;	582	ymax = y > ymax ? y : ymax;
…		…
634		588
635	for (int y = ymin; y <= ymax; y++)	589	for (int y = ymin; y <= ymax; y++)
636	for (int x = xmin; x <= xmax; x++)	590	for (int x = xmin; x <= xmax; x++)
637	sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);	591	sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
638		592
639	Send_With_Handling (pl->contr->socket, &sl);	593	pl->contr->ns->send_packet (sl);
640		594
641	free (map_mark);	595	free (map_mark);
642	}	596	}
643		597
644
645	/**	598	/**
646	* Send a kill log record to sockets	599	* Send a kill log record to sockets
647	*/	600	*/
648
649	void	601	void
650	Log_Kill (const char Who, const char What, int WhatType, const char *With, int WithType)	602	Log_Kill (const char Who, const char What, int WhatType, const char *With, int WithType)
651	{	603	{
652	size_t len;	604	size_t len;
653	char buf[MAX_BUF];	605	char buf[MAX_BUF];
…		…
657	else	609	else
658	snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);	610	snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
659		611
660	len = strlen (buf);	612	len = strlen (buf);
661	}	613	}
		614

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.17 by root, Thu Dec 14 04:30:33 2006 UTC vs. Revision 1.35 by root, Sun Mar 11 02:12:45 2007 UTC

Diff Legend

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.17 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.35 by root, Sun Mar 11 02:12:45 2007 UTC