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

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.40 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.54 by root, Wed Nov 4 14:45:30 2009 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 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.
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	}	53	}
52		54
53	/**	55	/**
54	* Draws an extended message on the client.	56	* Draws an extended message on the client.
55	* ns the socket to send message to	57	* ns the socket to send message to
…		…
60	* message The main message	62	* message The main message
61	*/	63	*/
62	static void	64	static void
63	esrv_print_ext_msg (client 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)
64	{	66	{
65	ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);	67	ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message);
66	}	68	}
67		69
68	/**	70	/**
69	* Frontend for esrv_print_msg	71	* Frontend for esrv_print_msg
70	* \param colr message color	72	* \param colr message color
…		…
83		85
84	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))	86	if (!pl \|\| (pl->type == PLAYER && pl->contr == NULL))
85	return;	87	return;
86		88
87	if (pl->type == PLAYER)	89	if (pl->type == PLAYER)
88	esrv_print_msg (pl->contr->ns, colr, (char *) tmp);	90	esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
89	}	91	}
90		92
91	bool	93	bool
92	client::msg_suppressed (const char *msg)	94	client::msg_suppressed (const char *msg)
93	{	95	{
…		…
138	/**	140	/**
139	* Sends message to player(s).	141	* Sends message to player(s).
140	*	142	*
141	* flags is various flags - mostly color, plus a few specials.	143	* flags is various flags - mostly color, plus a few specials.
142	*	144	*
143	* pri is priority. It is a little odd - the lower the value, the more	145	* pri is unused.
144	* important it is. Thus, 0 gets sent no matter what. Otherwise, the
145	* value must be less than the listening level that the player has set.
146	* Unfortunately, there is no clear guideline on what each level does what.
147	*	146	*
148	* 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
149	* in the flags.	148	* in the flags.
150	*	149	*
151	* 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.
152	*	151	*
153	*/	152	*/
154	void	153	void
155	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)
156	{	155	{
157	if (flags & NDI_ALL)	156	if (flags & NDI_ALL)
158	{	157	{
159	for_all_players (pl)	158	for_all_players (pl)
160	new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);	159	new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf);
161		160	}
		161	else
		162	{
		163	if (!op \|\| !op->contr \|\| !op->contr->ns)
162	return;	164	return;
163	}
164		165
165	if (!pl \|\| pl->type != PLAYER \|\| !pl->contr \|\| !pl->contr->ns)
166	return;
167
168	if (pri >= pl->contr->listening)
169	return;
170
171	if ((flags & (NDI_COLOR_MASK \| NDI_UNIQUE)) != NDI_BLACK	166	if ((flags & (NDI_COLOR_MASK \| NDI_UNIQUE)) != NDI_BLACK
172	\|\| !pl->contr->ns->msg_suppressed (buf))	167	\|\| !op->contr->ns->msg_suppressed (buf))
173	print_message (flags & NDI_COLOR_MASK, pl, buf);	168	print_message (flags & NDI_COLOR_MASK, op, buf);
		169	}
174	}	170	}
175		171
176	/**	172	/**
177	* Wrapper for new_draw_info printf-like.	173	* Wrapper for new_draw_info printf-like.
178	*	174	*
…		…
182	* client/server bandwidth (client could keep track of various strings	178	* client/server bandwidth (client could keep track of various strings
183	*/	179	*/
184	void	180	void
185	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, ...)
186	{	182	{
187	char buf[HUGE_BUF];
188
189	va_list ap;	183	va_list ap;
190	va_start (ap, format);	184	va_start (ap, format);
191	vsnprintf (buf, HUGE_BUF, format, ap);	185	new_draw_info (flags, pri, pl, vformat (format, ap));
192	va_end (ap);	186	va_end (ap);
193
194	new_draw_info (flags, pri, pl, buf);
195	}	187	}
196		188
197	void	189	void
198	draw_ext_info (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char message, const char *oldmessage)	190	draw_ext_info (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char message, const char *oldmessage)
199	{	191	{
200		192
201	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))	193	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))
202	return;
203
204	if (pri >= pl->contr->listening)
205	return;	194	return;
206		195
207	if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))	196	if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
208	{	197	{
209	char buf = (char ) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);	198	char buf = (char ) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
…		…
223	}	212	}
224		213
225	void	214	void
226	draw_ext_info_format (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char old_format, char *new_format, ...)	215	draw_ext_info_format (int flags, int pri, const object pl, uint8 type, uint8 subtype, const char old_format, char *new_format, ...)
227	{	216	{
228	char buf[HUGE_BUF];	217	va_list ap;
		218	va_start (ap, new_format);
229		219
230	if (!pl \|\| (pl->type != PLAYER) \|\| (pl->contr == NULL))	220	if (!pl \|\| !pl->is_player ())
231	return;	221	return;
232		222
233	if (pri >= pl->contr->listening)	223	// TODO: just assume, and rip out?
234	return;
235
236	if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))	224	if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
237	{	225	{
238	va_list ap;
239
240	LOG (llevDebug, "Non supported extension text type for client.\n");	226	LOG (llevDebug, "Non supported extension text type for client.\n");
241	va_start (ap, new_format);
242	vsnprintf (buf, HUGE_BUF, old_format, ap);
243	va_end (ap);
244	new_draw_info (flags, pri, pl, buf);	227	new_draw_info (flags, pri, pl, vformat (old_format, ap));
245	return;
246	}	228	}
247	else	229	else
248	{	230	{
249	va_list ap;	231	char *buf = vformat (new_format, ap);
250
251	va_start (ap, new_format);
252	vsnprintf (buf, HUGE_BUF, new_format, ap);
253	va_end (ap);
254	strip_media_tag (buf);	232	strip_media_tag (buf);
255	esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);	233	esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
256	}	234	}
		235
		236	va_end (ap);
257	}	237	}
258		238
259	/**	239	/**
260	* Writes to everyone on the map except op. This is useful for emotions.	240	* Writes to everyone on the map except op. This is useful for emotions.
261	*/	241	*/
262		242
263	void	243	void
264	new_info_map_except (int color, maptile * map, object op, const char str)	244	new_info_map_except (int color, maptile * map, object op, const char str)
265	{	245	{
266	for_all_players (pl)	246	for_all_players (pl)
267	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)	247	if (pl->ob->map == map && pl->ob != op)
268	new_draw_info (color, 0, pl->ob, str);	248	new_draw_info (color, 0, pl->ob, str);
269	}	249	}
270		250
271	/**	251	/**
272	* Writes to everyone on the map except op1 and op2	252	* Writes to everyone on the map except op1 and op2
273	*/	253	*/
274
275	void	254	void
276	new_info_map_except2 (int color, maptile * map, object op1, object op2, const char *str)	255	new_info_map_except2 (int color, maptile * map, object op1, object op2, const char *str)
277	{	256	{
278	for_all_players (pl)	257	for_all_players (pl)
279	if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)	258	if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
280	new_draw_info (color, 0, pl->ob, str);	259	new_draw_info (color, 0, pl->ob, str);
281	}	260	}
282		261
283	/**	262	/**
284	* Writes to everyone on the specified map	263	* Writes to everyone on the specified map
285	*/	264	*/
286
287	void	265	void
288	new_info_map (int color, maptile * map, const char *str)	266	new_info_map (int color, maptile * map, const char *str)
289	{	267	{
290	for_all_players (pl)	268	for_all_players (pl)
291	if (pl->ob != NULL && pl->ob->map == map)	269	if (pl->ob->map == map)
292	new_draw_info (color, 0, pl->ob, str);	270	new_draw_info (color, 0, pl->ob, str);
293	}
294
295	/**
296	* This does nothing now. However, in theory, we should probably send
297	* something to the client and let the client figure out how it might want
298	* to handle this
299	*/
300	void
301	clear_win_info (object *op)
302	{
303	}	271	}
304		272
305	/**	273	/**
306	* Sets player title.	274	* Sets player title.
307	*/	275	*/
…		…
315	sprintf (buf, "Player: %s %s", (const char ) pl->name, (const char ) pl->contr->own_title);	283	sprintf (buf, "Player: %s %s", (const char ) pl->name, (const char ) pl->contr->own_title);
316	}	284	}
317		285
318	// formerly a macro, used only by magic map, so optimised it out	286	// formerly a macro, used only by magic map, so optimised it out
319	static inline faceidx	287	static inline faceidx
320	GET_MAP_FACE (maptile *m, int x, int y, int layer)	288	GET_MAP_FACE (mapspace &ms, int layer)
321	{	289	{
322	if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer))	290	if (object *op = ms.faces_obj [layer])
323	return op->face;	291	return op->face;
324	else	292	else
325	return 0;	293	return 0;
326	}	294	}
327		295
…		…
337	* for various code values.	305	* for various code values.
338	*/	306	*/
339	static void	307	static void
340	magic_mapping_mark_recursive (object pl, char map_mark, int px, int py)	308	magic_mapping_mark_recursive (object pl, char map_mark, int px, int py)
341	{	309	{
342	int x, y, dx, dy, mflags;
343	sint16 nx, ny;
344	maptile *mp;
345
346	for (dx = -1; dx <= 1; dx++)	310	for (int dx = -1; dx <= 1; dx++)
347	{	311	{
348	for (dy = -1; dy <= 1; dy++)	312	for (int dy = -1; dy <= 1; dy++)
349	{	313	{
350	x = px + dx;	314	int x = px + dx;
351	y = py + dy;	315	int y = py + dy;
352		316
353	if (FABS (x) >= MAGIC_MAP_HALF \|\| FABS (y) >= MAGIC_MAP_HALF)	317	if (abs (x) >= MAGIC_MAP_HALF \|\| abs (y) >= MAGIC_MAP_HALF)
354	continue;	318	continue;
355		319
356	mp = pl->map;	320	mapxy pos (pl);
357	nx = pl->x + x;	321	pos.move (x, y);
358	ny = pl->y + y;
359		322
360	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	323	if (!pos.normalise ())
361	if (mflags & P_OUT_OF_MAP)
362	continue;	324	continue;
		325
		326	mapspace &ms = pos.ms ();
363		327
364	if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)	328	if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
365	{	329	{
		330	int mflags = ms.flags ();
		331
366	int f = GET_MAP_FACE (mp, nx, ny, 0);	332	int f = GET_MAP_FACE (ms, 0);
367	if (f == blank_face)	333	if (f == blank_face)
368	{	334	{
369	f = GET_MAP_FACE (mp, nx, ny, 1);	335	f = GET_MAP_FACE (ms, 1);
370	if (f == blank_face)	336	if (f == blank_face)
371	f = GET_MAP_FACE (mp, nx, ny, 2);	337	f = GET_MAP_FACE (ms, 2);
372	}	338	}
373		339
374	int magicmap = faces [f].magicmap;	340	int magicmap = faces [f].magicmap;
375		341
376	/* Should probably have P_NO_MAGIC here also, but then shops don't	342	/* Should probably have P_NO_MAGIC here also, but then shops don't
…		…
389	}	355	}
390		356
391	/**	357	/**
392	* Creates magic map for player.	358	* Creates magic map for player.
393	*	359	*
394	* Note: For improved magic mapping display, the space that blocks	360	* Note: For improved magic mapping display, the space that blocks
395	* the view is now marked with value 2. Any dependencies of map_mark	361	* the view is now marked with value 2. Any dependencies of map_mark
396	* being nonzero have been changed to check for 1. Also, since	362	* being nonzero have been changed to check for 1. Also, since
397	* map_mark is a char value, putting 2 in should cause no problems.	363	* map_mark is a char value, putting 2 in should cause no problems.
398	*	364	*
399	* This function examines the map the player is on, and determines what	365	* This function examines the map the player is on, and determines what
400	* is visible. 2 is set for walls or objects that blocks view. 1	366	* is visible. 2 is set for walls or objects that blocks view. 1
401	* is for open spaces. map_mark should already have been initialised	367	* is for open spaces. map_mark should already have been initialised
402	* to zero before this is called.	368	* to zero before this is called.
403	* strength is an initial strength*2 rectangular area that we automatically	369	* strength is an initial strength*2 rectangular area that we automatically
404	* see in/penetrate through.	370	* see in/penetrate through.
405	*/	371	*/
406	void	372	void
407	magic_mapping_mark (object pl, char map_mark, int strength)	373	magic_mapping_mark (object pl, char map_mark, int strength)
408	{	374	{
409	int x, y, mflags;
410	sint16 nx, ny;
411	maptile *mp;
412
413	for (x = -strength; x < strength; x++)	375	for (int x = -strength; x < strength; x++)
414	{	376	{
415	for (y = -strength; y < strength; y++)	377	for (int y = -strength; y < strength; y++)
416	{	378	{
417	mp = pl->map;	379	mapxy pos (pl);
418	nx = pl->x + x;	380	pos.move (x, y);
419	ny = pl->y + y;
420		381
421	mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);	382	if (!pos.normalise ())
422	if (mflags & P_OUT_OF_MAP)
423	continue;	383	continue;
424		384
		385	mapspace &ms = pos.ms ();
		386
		387	int mflags = ms.flags ();
		388
425	int f = GET_MAP_FACE (mp, nx, ny, 0);	389	int f = GET_MAP_FACE (ms, 0);
426	if (f == blank_face)	390	if (f == blank_face)
427	{	391	{
428	f = GET_MAP_FACE (mp, nx, ny, 1);	392	f = GET_MAP_FACE (ms, 1);
429	if (f == blank_face)	393	if (f == blank_face)
430	f = GET_MAP_FACE (mp, nx, ny, 2);	394	f = GET_MAP_FACE (ms, 2);
431	}	395	}
432		396
433	int magicmap = faces [f].magicmap;	397	int magicmap = faces [f].magicmap;
434		398
435	if (mflags & P_BLOCKSVIEW)	399	if (mflags & P_BLOCKSVIEW)
…		…
497	pl->contr->ns->send_packet (sl);	461	pl->contr->ns->send_packet (sl);
498		462
499	free (map_mark);	463	free (map_mark);
500	}	464	}
501		465
502	/**
503	* Send a kill log record to sockets
504	*/
505	void
506	Log_Kill (const char Who, const char What, int WhatType, const char *With, int WithType)
507	{
508	size_t len;
509	char buf[MAX_BUF];
510
511	if (With != NULL)
512	snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
513	else
514	snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
515
516	len = strlen (buf);
517	}
518

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.40 by root, Mon Apr 30 04:25:30 2007 UTC vs. Revision 1.54 by root, Wed Nov 4 14:45:30 2009 UTC

Diff Legend

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.40 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.54 by root, Wed Nov 4 14:45:30 2009 UTC