[ViewVC] Diff of: cvs/deliantra/server/common/los.C

Comparing deliantra/server/common/los.C (file contents):
Revision 1.6 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.32 by root, Thu Dec 4 03:48:19 2008 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */	24	/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */
25		25
26	#include <global.h>	26	#include <global.h>
27	#include <funcpoint.h>
28	#include <math.h>	27	#include <math.h>
29
30		28
31	/* Distance must be less than this for the object to be blocked.	29	/* Distance must be less than this for the object to be blocked.
32	* An object is 1.0 wide, so if set to 0.5, it means the object	30	* An object is 1.0 wide, so if set to 0.5, it means the object
33	* that blocks half the view (0.0 is complete block) will	31	* that blocks half the view (0.0 is complete block) will
34	* block view in our tables.	32	* block view in our tables.
35	* .4 or less lets you see through walls. .5 is about right.	33	* .4 or less lets you see through walls. .5 is about right.
36	*/	34	*/
37		35
38	#define SPACE_BLOCK 0.5	36	#define SPACE_BLOCK 0.5
		37	#define MAX_DARKNESS_LOS 4 /* 4 == totally dark */
39		38
40	typedef struct blstr	39	typedef struct blstr
41	{	40	{
42	int x[4], y[4];	41	int x[4], y[4];
43	int index;	42	int index;
44	} blocks;	43	} blocks;
45		44
		45	// 31/32 == a speed hack
		46	// we would like to use 32 for speed, but the code loops endlessly
		47	// then, reason not yet identified, so only make the array use 32,
		48	// not the define's.
46	blocks block[MAP_CLIENT_X][MAP_CLIENT_Y];	49	blocks block[MAP_CLIENT_X][MAP_CLIENT_Y == 31 ? 32 : MAP_CLIENT_Y];
47		50
48	static void expand_lighted_sight (object *op);	51	static void expand_lighted_sight (object *op);
49		52
50	/*	53	/*
51	* Used to initialise the array used by the LOS routines.	54	* Used to initialise the array used by the LOS routines.
90		93
91	void	94	void
92	init_block (void)	95	init_block (void)
93	{	96	{
94	int x, y, dx, dy, i;	97	int x, y, dx, dy, i;
95	static int block_x[3] = { -1, -1, 0 }, block_y[3] =	98	static int block_x[3] = { -1, -1, 0 },
96	{	99	block_y[3] = { -1, 0, -1 };
97	-1, 0, -1};
98		100
99	for (x = 0; x < MAP_CLIENT_X; x++)	101	for (x = 0; x < MAP_CLIENT_X; x++)
100	for (y = 0; y < MAP_CLIENT_Y; y++)	102	for (y = 0; y < MAP_CLIENT_Y; y++)
101	{
102	block[x][y].index = 0;	103	block[x][y].index = 0;
103	}
104		104
105		105
106	/* The table should be symmetric, so only do the upper left	106	/* The table should be symmetric, so only do the upper left
107	* quadrant - makes the processing easier.	107	* quadrant - makes the processing easier.
108	*/	108	*/
…		…
125	/* For simplicity, we mirror the coordinates to block the other	125	/* For simplicity, we mirror the coordinates to block the other
126	* quadrants.	126	* quadrants.
127	*/	127	*/
128	set_block (x, y, dx, dy);	128	set_block (x, y, dx, dy);
129	if (x == MAP_CLIENT_X / 2)	129	if (x == MAP_CLIENT_X / 2)
130	{
131	set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1);	130	set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1);
132	}
133	else if (y == MAP_CLIENT_Y / 2)	131	else if (y == MAP_CLIENT_Y / 2)
134	{
135	set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);	132	set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);
136	}
137	}	133	}
138	else	134	else
139	{	135	{
140	float d1, r, s, l;	136	float d1, r, s, l;
141		137
…		…
144	* area. l is the distance from x,y to the line.	140	* area. l is the distance from x,y to the line.
145	* r is more a curiosity - it lets us know what direction (left/right)	141	* r is more a curiosity - it lets us know what direction (left/right)
146	* the line is off	142	* the line is off
147	*/	143	*/
148		144
149	d1 = (float) (pow (MAP_CLIENT_X / 2 - dx, 2) + pow (MAP_CLIENT_Y / 2 - dy, 2));	145	d1 = (float) (pow (MAP_CLIENT_X / 2 - dx, 2.f) + pow (MAP_CLIENT_Y / 2 - dy, 2.f));
150	r = (float) ((dy - y) * (dy - MAP_CLIENT_Y / 2) - (dx - x) * (MAP_CLIENT_X / 2 - dx)) / d1;	146	r = (float) ((dy - y) * (dy - MAP_CLIENT_Y / 2) - (dx - x) * (MAP_CLIENT_X / 2 - dx)) / d1;
151	s = (float) ((dy - y) * (MAP_CLIENT_X / 2 - dx) - (dx - x) * (MAP_CLIENT_Y / 2 - dy)) / d1;	147	s = (float) ((dy - y) * (MAP_CLIENT_X / 2 - dx) - (dx - x) * (MAP_CLIENT_Y / 2 - dy)) / d1;
152	l = FABS (sqrt (d1) * s);	148	l = FABS (sqrt (d1) * s);
153		149
154	if (l <= SPACE_BLOCK)	150	if (l <= SPACE_BLOCK)
…		…
175	* that if some particular space is blocked, it blocks	171	* that if some particular space is blocked, it blocks
176	* the view of the spaces 'behind' it, and those blocked	172	* the view of the spaces 'behind' it, and those blocked
177	* spaces behind it may block other spaces, etc.	173	* spaces behind it may block other spaces, etc.
178	* In this way, the chain of visibility is set.	174	* In this way, the chain of visibility is set.
179	*/	175	*/
180
181	static void	176	static void
182	set_wall (object *op, int x, int y)	177	set_wall (object *op, int x, int y)
183	{	178	{
184	int i;	179	int i;
185		180
…		…
188	int dx = block[x][y].x[i], dy = block[x][y].y[i], ax, ay;	183	int dx = block[x][y].x[i], dy = block[x][y].y[i], ax, ay;
189		184
190	/* ax, ay are the values as adjusted to be in the	185	/* ax, ay are the values as adjusted to be in the
191	* socket look structure.	186	* socket look structure.
192	*/	187	*/
193	ax = dx - (MAP_CLIENT_X - op->contr->socket.mapx) / 2;	188	ax = dx - (MAP_CLIENT_X - op->contr->ns->mapx) / 2;
194	ay = dy - (MAP_CLIENT_Y - op->contr->socket.mapy) / 2;	189	ay = dy - (MAP_CLIENT_Y - op->contr->ns->mapy) / 2;
195		190
196	if (ax < 0 \|\| ax >= op->contr->socket.mapx \|\| ay < 0 \|\| ay >= op->contr->socket.mapy)	191	if (ax < 0 \|\| ax >= op->contr->ns->mapx \|\| ay < 0 \|\| ay >= op->contr->ns->mapy)
197	continue;	192	continue;
198	#if 0	193	#if 0
199	LOG (llevDebug, "blocked %d %d -> %d %d\n", dx, dy, ax, ay);	194	LOG (llevDebug, "blocked %d %d -> %d %d\n", dx, dy, ax, ay);
200	#endif	195	#endif
201	/* we need to adjust to the fact that the socket	196	/* we need to adjust to the fact that the socket
…		…
220		215
221	if (!block[x][y].index)	216	if (!block[x][y].index)
222	return;	217	return;
223		218
224	/* ax, ay are coordinates as indexed into the look window */	219	/* ax, ay are coordinates as indexed into the look window */
225	ax = x - (MAP_CLIENT_X - op->contr->socket.mapx) / 2;	220	ax = x - (MAP_CLIENT_X - op->contr->ns->mapx) / 2;
226	ay = y - (MAP_CLIENT_Y - op->contr->socket.mapy) / 2;	221	ay = y - (MAP_CLIENT_Y - op->contr->ns->mapy) / 2;
227		222
228	/* If the converted coordinates are outside the viewable	223	/* If the converted coordinates are outside the viewable
229	* area for the client, return now.	224	* area for the client, return now.
230	*/	225	*/
231	if (ax < 0 \|\| ay < 0 \|\| ax >= op->contr->socket.mapx \|\| ay >= op->contr->socket.mapy)	226	if (ax < 0 \|\| ay < 0 \|\| ax >= op->contr->ns->mapx \|\| ay >= op->contr->ns->mapy)
232	return;	227	return;
233		228
234	#if 0	229	#if 0
235	LOG (llevDebug, "check_wall, ax,ay=%d, %d x,y = %d, %d blocksview = %d, %d\n",	230	LOG (llevDebug, "check_wall, ax,ay=%d, %d x,y = %d, %d blocksview = %d, %d\n",
236	ax, ay, x, y, op->x + x - MAP_CLIENT_X / 2, op->y + y - MAP_CLIENT_Y / 2);	231	ax, ay, x, y, op->x + x - MAP_CLIENT_X / 2, op->y + y - MAP_CLIENT_Y / 2);
…		…
252	* Clears/initialises the los-array associated to the player	247	* Clears/initialises the los-array associated to the player
253	* controlling the object.	248	* controlling the object.
254	*/	249	*/
255		250
256	void	251	void
257	clear_los (object *op)	252	clear_los (player *pl)
258	{	253	{
259	/* This is safer than using the socket->mapx, mapy because	254	/* This is safer than using the ns->mapx, mapy because
260	* we index the blocked_los as a 2 way array, so clearing	255	* we index the blocked_los as a 2 way array, so clearing
261	* the first z spaces may not not cover the spaces we are	256	* the first z spaces may not not cover the spaces we are
262	* actually going to use	257	* actually going to use
263	*/	258	*/
264	(void) memset ((void ) op->contr->blocked_los, 0, MAP_CLIENT_X MAP_CLIENT_Y);	259	memset (pl->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y);
265	}	260	}
266		261
267	/*	262	/*
268	* expand_sight goes through the array of what the given player is	263	* expand_sight goes through the array of what the given player is
269	* able to see, and expands the visible area a bit, so the player will,	264	* able to see, and expands the visible area a bit, so the player will,
…		…
274	static void	269	static void
275	expand_sight (object *op)	270	expand_sight (object *op)
276	{	271	{
277	int i, x, y, dx, dy;	272	int i, x, y, dx, dy;
278		273
279	for (x = 1; x < op->contr->socket.mapx - 1; x++) /* loop over inner squares */	274	for (x = 1; x < op->contr->ns->mapx - 1; x++) /* loop over inner squares */
280	for (y = 1; y < op->contr->socket.mapy - 1; y++)	275	for (y = 1; y < op->contr->ns->mapy - 1; y++)
281	{	276	{
282	if (!op->contr->blocked_los[x][y] &&	277	if (!op->contr->blocked_los[x][y] &&
283	!(get_map_flags (op->map, NULL,	278	!(get_map_flags (op->map, NULL,
284	op->x - op->contr->socket.mapx / 2 + x,	279	op->x - op->contr->ns->mapx / 2 + x,
285	op->y - op->contr->socket.mapy / 2 + y, NULL, NULL) & (P_BLOCKSVIEW \| P_OUT_OF_MAP)))	280	op->y - op->contr->ns->mapy / 2 + y, NULL, NULL) & (P_BLOCKSVIEW \| P_OUT_OF_MAP)))
286	{	281	{
287		282
288	for (i = 1; i <= 8; i += 1)	283	for (i = 1; i <= 8; i += 1)
289	{ /* mark all directions */	284	{ /* mark all directions */
290	dx = x + freearr_x[i];	285	dx = x + freearr_x[i];
…		…
293	op->contr->blocked_los[dx][dy] = -1;	288	op->contr->blocked_los[dx][dy] = -1;
294	}	289	}
295	}	290	}
296	}	291	}
297		292
298	if (MAP_DARKNESS (op->map) > 0) /* player is on a dark map */	293	if (op->map->darkness > 0) /* player is on a dark map */
299	expand_lighted_sight (op);	294	expand_lighted_sight (op);
300		295
301
302	/* clear mark squares */	296	/* clear mark squares */
303	for (x = 0; x < op->contr->socket.mapx; x++)	297	for (x = 0; x < op->contr->ns->mapx; x++)
304	for (y = 0; y < op->contr->socket.mapy; y++)	298	for (y = 0; y < op->contr->ns->mapy; y++)
305	if (op->contr->blocked_los[x][y] < 0)	299	if (op->contr->blocked_los[x][y] < 0)
306	op->contr->blocked_los[x][y] = 0;	300	op->contr->blocked_los[x][y] = 0;
307	}	301	}
308
309
310
311		302
312	/* returns true if op carries one or more lights	303	/* returns true if op carries one or more lights
313	* This is a trivial function now days, but it used to	304	* This is a trivial function now days, but it used to
314	* be a bit longer. Probably better for callers to just	305	* be a bit longer. Probably better for callers to just
315	* check the op->glow_radius instead of calling this.	306	* check the op->glow_radius instead of calling this.
…		…
323	return 1;	314	return 1;
324		315
325	return 0;	316	return 0;
326	}	317	}
327		318
		319	/* radius, distance => lightness adjust */
		320	static sint8 darkness[MAX_LIGHT_RADIUS * 2 + 1][MAX_LIGHT_RADIUS + 1];
		321
		322	static struct darkness_init
		323	{
		324	darkness_init ()
		325	{
		326	for (int radius = -MAX_LIGHT_RADIUS; radius <= MAX_LIGHT_RADIUS; ++radius)
		327	for (int distance = 0; distance <= MAX_LIGHT_RADIUS; ++distance)
		328	{
		329	// max intensity
		330	int intensity = min (MAX_DARKNESS_LOS, abs (radius) + 1);
		331
		332	// actual intensity
		333	intensity = max (0, lerp_rd (distance, 0, abs (radius) + 1, intensity, 0));
		334
		335	darkness [radius + MAX_LIGHT_RADIUS][distance] = radius < 0
		336	? intensity
		337	: MAX_DARKNESS_LOS - intensity;
		338	}
		339	}
		340	} darkness_init;
		341
328	static void	342	static void
329	expand_lighted_sight (object *op)	343	expand_lighted_sight (object *op)
330	{	344	{
331	int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1;	345	int x, y, darklevel, basex, basey, mflags, light, x1, y1;
332	maptile *m = op->map;	346	maptile *m = op->map;
333	sint16 nx, ny;	347	sint16 nx, ny;
334		348
		349	darklevel = m->darkness;
335	darklevel = MAP_DARKNESS (m);	350	darklevel = MAX_DARKNESS;//D
336		351
337	/* If the player can see in the dark, lower the darklevel for him */	352	/* If the player can see in the dark, lower the darklevel for him */
338	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))	353	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
339	darklevel -= 2;	354	darklevel -= MAX_DARKNESS_LOS / 2;
340		355
341	/* add light, by finding all (non-null) nearby light sources, then	356	/* add light, by finding all (non-null) nearby light sources, then
342	* mark those squares specially. If the darklevel<1, there is no	357	* mark those squares specially. If the darklevel<1, there is no
343	* reason to do this, so we skip this function	358	* reason to do this, so we skip this function
344	*/	359	*/
…		…
349	/* Do a sanity check. If not valid, some code below may do odd	364	/* Do a sanity check. If not valid, some code below may do odd
350	* things.	365	* things.
351	*/	366	*/
352	if (darklevel > MAX_DARKNESS)	367	if (darklevel > MAX_DARKNESS)
353	{	368	{
354	LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, op->map->path, darklevel);	369	LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);
355	darklevel = MAX_DARKNESS;	370	darklevel = MAX_DARKNESS;
356	}	371	}
357		372
358	/* First, limit player furthest (unlighted) vision */	373	/* first, make everything totally dark */
359	for (x = 0; x < op->contr->socket.mapx; x++)	374	for (x = 0; x < op->contr->ns->mapx; x++)
360	for (y = 0; y < op->contr->socket.mapy; y++)	375	for (y = 0; y < op->contr->ns->mapy; y++)
361	if (op->contr->blocked_los[x][y] != 100)	376	if (op->contr->blocked_los[x][y] != 100)
362	op->contr->blocked_los[x][y] = MAX_LIGHT_RADII;	377	op->contr->blocked_los[x][y] = MAX_DARKNESS_LOS;
363		378
364	/* the spaces[] darkness value contains the information we need.	379	int half_x = op->contr->ns->mapx / 2;
		380	int half_y = op->contr->ns->mapy / 2;
		381
		382	int min_x = op->x - half_x - MAX_LIGHT_RADIUS;
		383	int min_y = op->y - half_y - MAX_LIGHT_RADIUS;
		384	int max_x = op->x + half_x + MAX_LIGHT_RADIUS;
		385	int max_y = op->y + half_y + MAX_LIGHT_RADIUS;
		386
		387	int pass2 = 0; // negative lights have an extra pass
		388
		389	/*
365	* Only process the area of interest.	390	* Only process the area of interest.
366	* the basex, basey values represent the position in the op->contr->blocked_los	391	* the basex, basey values represent the position in the op->contr->blocked_los
367	* array. Its easier to just increment them here (and start with the right	392	* array. Its easier to just increment them here (and start with the right
368	* value) than to recalculate them down below.	393	* value) than to recalculate them down below.
369	*/	394	*/
370	for (x = (op->x - op->contr->socket.mapx / 2 - MAX_LIGHT_RADII), basex = -MAX_LIGHT_RADII;	395	for (int x = min_x, basex = -MAX_LIGHT_RADIUS; x <= max_x; x++, basex++)
371	x <= (op->x + op->contr->socket.mapx / 2 + MAX_LIGHT_RADII); x++, basex++)	396	for (int y = min_y, basey = -MAX_LIGHT_RADIUS; y <= max_y; y++, basey++)
372	{
373
374	for (y = (op->y - op->contr->socket.mapy / 2 - MAX_LIGHT_RADII), basey = -MAX_LIGHT_RADII;
375	y <= (op->y + op->contr->socket.mapy / 2 + MAX_LIGHT_RADII); y++, basey++)
376	{	397	{
		398	maptile *m = op->map;
		399	sint16 nx = x;
		400	sint16 ny = y;
		401
		402	if (!xy_normalise (m, nx, ny))
		403	continue;
		404
		405	mapspace &ms = m->at (nx, ny);
		406	ms.update ();
		407	sint8 light = ms.light;
		408
		409	if (expect_false (light))
		410	if (light < 0)
		411	pass2 = 1;
		412	else
		413	{
		414	/* This space is providing light, so we need to brighten up the
		415	* spaces around here.
		416	*/
		417	const sint8 *darkness_table = darkness [light + MAX_LIGHT_RADIUS];
		418
		419	for (int ax = max (0, basex - light); ax <= min (basex + light, op->contr->ns->mapx - 1); ax++)
		420	for (int ay = max (0, basey - light); ay <= min (basey + light, op->contr->ns->mapy - 1); ay++)
		421	if (op->contr->blocked_los[ax][ay] != 100)
		422	min_it (op->contr->blocked_los[ax][ay], darkness_table [idistance (ax - basex, ay - basey)]);
		423	}
		424	}
		425
		426	// psosibly do 2nd pass for rare negative glow radii
		427	if (pass2)
		428	for (x = min_x, basex = -MAX_LIGHT_RADIUS; x <= max_x; x++, basex++)
		429	for (y = min_y, basey = -MAX_LIGHT_RADIUS; y <= max_y; y++, basey++)
		430	{
377	m = op->map;	431	maptile *m = op->map;
378	nx = x;	432	sint16 nx = x;
379	ny = y;	433	sint16 ny = y;
380		434
381	mflags = get_map_flags (m, &m, nx, ny, &nx, &ny);	435	if (!xy_normalise (m, nx, ny))
382
383	if (mflags & P_OUT_OF_MAP)
384	continue;	436	continue;
385		437
386	/* This space is providing light, so we need to brighten up the	438	mapspace &ms = m->at (nx, ny);
387	* spaces around here.	439	ms.update ();
388	*/	440	sint8 light = ms.light;
389	light = GET_MAP_LIGHT (m, nx, ny);	441
390	if (light != 0)	442	if (expect_false (light < 0))
391	{	443	{
392	#if 0	444	const sint8 *darkness_table = darkness [light + MAX_LIGHT_RADIUS];
393	LOG (llevDebug, "expand_lighted_sight: Found light at x=%d, y=%d, basex=%d, basey=%d\n", x, y, basex, basey);
394	#endif
395	for (ax = basex - light; ax <= basex + light; ax++)
396	{
397	if (ax < 0 \|\| ax >= op->contr->socket.mapx)
398	continue;
399	for (ay = basey - light; ay <= basey + light; ay++)
400	{
401	if (ay < 0 \|\| ay >= op->contr->socket.mapy)
402	continue;
403		445
404	/* If the space is fully blocked, do nothing. Otherwise, we	446	for (int ax = max (0, basex + light); ax <= min (basex - light, op->contr->ns->mapx - 1); ax++)
405	* brighten the space. The further the light is away from the	447	for (int ay = max (0, basey + light); ay <= min (basey - light, op->contr->ns->mapy - 1); ay++)
406	* source (basex-x), the less effect it has. Though light used
407	* to dim in a square manner, it now dims in a circular manner
408	* using the the pythagorean theorem. glow_radius still
409	* represents the radius
410	*/
411	if (op->contr->blocked_los[ax][ay] != 100)	448	if (op->contr->blocked_los[ax][ay] != 100)
412	{	449	max_it (op->contr->blocked_los[ax][ay], darkness_table [idistance (ax - basex, ay - basey)]);
413	x1 = abs (basex - ax) * abs (basex - ax);	450	}
414	y1 = abs (basey - ay) * abs (basey - ay);	451	}
415	if (light > 0)
416	op->contr->blocked_los[ax][ay] -= MAX ((light - isqrt (x1 + y1)), 0);
417	if (light < 0)
418	op->contr->blocked_los[ax][ay] -= MIN ((light + isqrt (x1 + y1)), 0);
419	}
420	} /* for ay */
421	} /* for ax */
422	} /* if this space is providing light */
423	} /* for y */
424	} /* for x */
425		452
426	/* Outdoor should never really be completely pitch black dark like	453	/* Outdoor should never really be completely pitch black dark like
427	* a dungeon, so let the player at least see a little around themselves	454	* a dungeon, so let the player at least see a little around themselves
428	*/	455	*/
429	if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3))	456	if (op->map->outdoor && darklevel > MAX_DARKNESS - 3)
430	{	457	{
431	if (op->contr->blocked_los[op->contr->socket.mapx / 2][op->contr->socket.mapy / 2] > (MAX_DARKNESS - 3))	458	if (op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] > (MAX_DARKNESS - 3))
432	op->contr->blocked_los[op->contr->socket.mapx / 2][op->contr->socket.mapy / 2] = MAX_DARKNESS - 3;	459	op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = MAX_DARKNESS - 3;
433		460
434	for (x = -1; x <= 1; x++)	461	for (x = -1; x <= 1; x++)
435	for (y = -1; y <= 1; y++)	462	for (y = -1; y <= 1; y++)
436	{	463	{
437	if (op->contr->blocked_los[x + op->contr->socket.mapx / 2][y + op->contr->socket.mapy / 2] > (MAX_DARKNESS - 2))	464	if (op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] > (MAX_DARKNESS - 2))
438	op->contr->blocked_los[x + op->contr->socket.mapx / 2][y + op->contr->socket.mapy / 2] = MAX_DARKNESS - 2;	465	op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] = MAX_DARKNESS - 2;
439	}	466	}
440	}	467	}
		468
441	/* grant some vision to the player, based on the darklevel */	469	/* grant some vision to the player, based on the darklevel */
442	for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)	470	for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)
443	for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++)	471	for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++)
444	if (!(op->contr->blocked_los[x + op->contr->socket.mapx / 2][y + op->contr->socket.mapy / 2] == 100))	472	if (!(op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] == 100))
445	op->contr->blocked_los[x + op->contr->socket.mapx / 2][y + op->contr->socket.mapy / 2] -=	473	op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] -=
446	MAX (0, 6 - darklevel - MAX (abs (x), abs (y)));	474	max (0, 6 - darklevel - max (abs (x), abs (y)));
447	}	475	}
448		476
449	/* blinded_sight() - sets all veiwable squares to blocked except	477	/* blinded_sight() - sets all viewable squares to blocked except
450	* for the one the central one that the player occupies. A little	478	* for the one the central one that the player occupies. A little
451	* odd that you can see yourself (and what your standing on), but	479	* odd that you can see yourself (and what your standing on), but
452	* really need for any reasonable game play.	480	* really need for any reasonable game play.
453	*/	481	*/
454
455	static void	482	static void
456	blinded_sight (object *op)	483	blinded_sight (object *op)
457	{	484	{
458	int x, y;	485	int x, y;
459		486
460	for (x = 0; x < op->contr->socket.mapx; x++)	487	for (x = 0; x < op->contr->ns->mapx; x++)
461	for (y = 0; y < op->contr->socket.mapy; y++)	488	for (y = 0; y < op->contr->ns->mapy; y++)
462	op->contr->blocked_los[x][y] = 100;	489	op->contr->blocked_los[x][y] = 100;
463		490
464	op->contr->blocked_los[op->contr->socket.mapx / 2][op->contr->socket.mapy / 2] = 0;	491	op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = 0;
465	}	492	}
466		493
467	/*	494	/*
468	* update_los() recalculates the array which specifies what is	495	* update_los() recalculates the array which specifies what is
469	* visible for the given player-object.	496	* visible for the given player-object.
470	*/	497	*/
471
472	void	498	void
473	update_los (object *op)	499	update_los (object *op)
474	{	500	{
475	int dx = op->contr->socket.mapx / 2, dy = op->contr->socket.mapy / 2, x, y;	501	int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y;
476		502
477	if (QUERY_FLAG (op, FLAG_REMOVED))	503	if (QUERY_FLAG (op, FLAG_REMOVED))
478	return;	504	return;
479		505
480	clear_los (op);	506	clear_los (op->contr);
		507
481	if (QUERY_FLAG (op, FLAG_WIZ) /* \|\|XRAYS(op) */ )	508	if (QUERY_FLAG (op, FLAG_WIZ) /* \|\|XRAYS(op) */ )
482	return;	509	return;
483		510
484	/* For larger maps, this is more efficient than the old way which	511	/* For larger maps, this is more efficient than the old way which
485	* used the chaining of the block array. Since many space views could	512	* used the chaining of the block array. Since many space views could
486	* be blocked by different spaces in front, this mean that a lot of spaces	513	* be blocked by different spaces in front, this mean that a lot of spaces
487	* could be examined multile times, as each path would be looked at.	514	* could be examined multile times, as each path would be looked at.
488	*/	515	*/
489	for (x = (MAP_CLIENT_X - op->contr->socket.mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->socket.mapx) / 2 + 1; x++)	516	for (x = (MAP_CLIENT_X - op->contr->ns->mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->ns->mapx) / 2 + 1; x++)
490	for (y = (MAP_CLIENT_Y - op->contr->socket.mapy) / 2 - 1; y < (MAP_CLIENT_Y + op->contr->socket.mapy) / 2 + 1; y++)	517	for (y = (MAP_CLIENT_Y - op->contr->ns->mapy) / 2 - 1; y < (MAP_CLIENT_Y + op->contr->ns->mapy) / 2 + 1; y++)
491	check_wall (op, x, y);	518	check_wall (op, x, y);
492
493		519
494	/* do the los of the player. 3 (potential) cases */	520	/* do the los of the player. 3 (potential) cases */
495	if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */	521	if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */
496	blinded_sight (op);	522	blinded_sight (op);
497	else	523	else
498	expand_sight (op);	524	expand_sight (op);
499		525
		526	//TODO: no range-checking whatsoever :(
500	if (QUERY_FLAG (op, FLAG_XRAYS))	527	if (QUERY_FLAG (op, FLAG_XRAYS))
501	{
502	int x, y;
503
504	for (x = -2; x <= 2; x++)	528	for (int x = -2; x <= 2; x++)
505	for (y = -2; y <= 2; y++)	529	for (int y = -2; y <= 2; y++)
506	op->contr->blocked_los[dx + x][dy + y] = 0;	530	op->contr->blocked_los[dx + x][dy + y] = 0;
507	}
508	}	531	}
509		532
510	/* update all_map_los is like update_all_los below,	533	/* update all_map_los is like update_all_los below,
511	* but updates everyone on the map, no matter where they	534	* but updates everyone on the map, no matter where they
512	* are. This generally should not be used, as a per	535	* are. This generally should not be used, as a per
513	* specific map change doesn't make much sense when tiling	536	* specific map change doesn't make much sense when tiling
514	* is considered (lowering darkness would certainly be a	537	* is considered (lowering darkness would certainly be a
515	* strange effect if done on a tile map, as it makes	538	* strange effect if done on a tile map, as it makes
516	* the distinction between maps much more obvious to the	539	* the distinction between maps much more obvious to the
517	* players, which is should not be.	540	* players, which is should not be.
…		…
519	* change_map_light function	542	* change_map_light function
520	*/	543	*/
521	void	544	void
522	update_all_map_los (maptile *map)	545	update_all_map_los (maptile *map)
523	{	546	{
524	player *pl;	547	for_all_players (pl)
525
526	for (pl = first_player; pl != NULL; pl = pl->next)
527	{
528	if (pl->ob->map == map)	548	if (pl->ob && pl->ob->map == map)
529	pl->do_los = 1;	549	pl->do_los = 1;
530	}
531	}	550	}
532
533		551
534	/*	552	/*
535	* This function makes sure that update_los() will be called for all	553	* This function makes sure that update_los() will be called for all
536	* players on the given map within the next frame.	554	* players on the given map within the next frame.
537	* It is triggered by removal or inserting of objects which blocks	555	* It is triggered by removal or inserting of objects which blocks
…		…
541	* means that just being on the same map is not sufficient - the	559	* means that just being on the same map is not sufficient - the
542	* space that changes must be withing your viewable area.	560	* space that changes must be withing your viewable area.
543	*	561	*
544	* map is the map that changed, x and y are the coordinates.	562	* map is the map that changed, x and y are the coordinates.
545	*/	563	*/
546
547	void	564	void
548	update_all_los (const maptile *map, int x, int y)	565	update_all_los (const maptile *map, int x, int y)
549	{	566	{
550	player *pl;	567	for_all_players (pl)
551
552	for (pl = first_player; pl != NULL; pl = pl->next)
553	{	568	{
554	/* Player should not have a null map, but do this	569	/* Player should not have a null map, but do this
555	* check as a safety	570	* check as a safety
556	*/	571	*/
557	if (!pl->ob->map)	572	if (!pl->ob \|\| !pl->ob->map \|\| !pl->ns)
558	continue;	573	continue;
559		574
560	/* Same map is simple case - see if pl is close enough.	575	/* Same map is simple case - see if pl is close enough.
561	* Note in all cases, we did the check for same map first,	576	* Note in all cases, we did the check for same map first,
562	* and then see if the player is close enough and update	577	* and then see if the player is close enough and update
…		…
566	* so by setting it up this way, we trim processing	581	* so by setting it up this way, we trim processing
567	* some.	582	* some.
568	*/	583	*/
569	if (pl->ob->map == map)	584	if (pl->ob->map == map)
570	{	585	{
571	if ((abs (pl->ob->x - x) <= pl->socket.mapx / 2) && (abs (pl->ob->y - y) <= pl->socket.mapy / 2))	586	if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
572	pl->do_los = 1;	587	pl->do_los = 1;
573	}	588	}
		589
574	/* Now we check to see if player is on adjacent	590	/* Now we check to see if player is on adjacent
575	* maps to the one that changed and also within	591	* maps to the one that changed and also within
576	* view. The tile_maps[] could be null, but in that	592	* view. The tile_maps[] could be null, but in that
577	* case it should never match the pl->ob->map, so	593	* case it should never match the pl->ob->map, so
578	* we want ever try to dereference any of the data in it.	594	* we want ever try to dereference any of the data in it.
579	*/	595	*
580
581	/* The logic for 0 and 3 is to see how far the player is	596	* The logic for 0 and 3 is to see how far the player is
582	* from the edge of the map (height/width) - pl->ob->(x,y)	597	* from the edge of the map (height/width) - pl->ob->(x,y)
583	* and to add current position on this map - that gives a	598	* and to add current position on this map - that gives a
584	* distance.	599	* distance.
585	* For 1 and 2, we check to see how far the given	600	* For 1 and 2, we check to see how far the given
586	* coordinate (x,y) is from the corresponding edge,	601	* coordinate (x,y) is from the corresponding edge,
587	* and then add the players location, which gives	602	* and then add the players location, which gives
588	* a distance.	603	* a distance.
589	*/	604	*/
590	else if (pl->ob->map == map->tile_map[0])	605	else if (pl->ob->map == map->tile_map[0])
591	{	606	{
592	if ((abs (pl->ob->x - x) <= pl->socket.mapx / 2) && (abs (y + MAP_HEIGHT (map->tile_map[0]) - pl->ob->y) <= pl->socket.mapy / 2))	607	if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (y + map->tile_map[0]->height - pl->ob->y) <= pl->ns->mapy / 2))
593	pl->do_los = 1;	608	pl->do_los = 1;
594	}	609	}
595	else if (pl->ob->map == map->tile_map[2])	610	else if (pl->ob->map == map->tile_map[2])
596	{	611	{
597	if ((abs (pl->ob->x - x) <= pl->socket.mapx / 2) && (abs (pl->ob->y + MAP_HEIGHT (map) - y) <= pl->socket.mapy / 2))	612	if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y + map->height - y) <= pl->ns->mapy / 2))
598	pl->do_los = 1;	613	pl->do_los = 1;
599	}	614	}
600	else if (pl->ob->map == map->tile_map[1])	615	else if (pl->ob->map == map->tile_map[1])
601	{	616	{
602	if ((abs (pl->ob->x + MAP_WIDTH (map) - x) <= pl->socket.mapx / 2) && (abs (pl->ob->y - y) <= pl->socket.mapy / 2))	617	if ((abs (pl->ob->x + map->width - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
603	pl->do_los = 1;	618	pl->do_los = 1;
604	}	619	}
605	else if (pl->ob->map == map->tile_map[3])	620	else if (pl->ob->map == map->tile_map[3])
606	{	621	{
607	if ((abs (x + MAP_WIDTH (map->tile_map[3]) - pl->ob->x) <= pl->socket.mapx / 2) && (abs (pl->ob->y - y) <= pl->socket.mapy / 2))	622	if ((abs (x + map->tile_map[3]->width - pl->ob->x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
608	pl->do_los = 1;	623	pl->do_los = 1;
609	}	624	}
610	}	625	}
611	}	626	}
612		627
613	/*	628	/*
614	* Debug-routine which dumps the array which specifies the visible	629	* Debug-routine which dumps the array which specifies the visible
615	* area of a player. Triggered by the z key in DM mode.	630	* area of a player. Triggered by the z key in DM mode.
616	*/	631	*/
617
618	void	632	void
619	print_los (object *op)	633	print_los (object *op)
620	{	634	{
621	int x, y;	635	int x, y;
622	char buf[50], buf2[10];	636	char buf[50], buf2[10];
623		637
624	strcpy (buf, " ");	638	strcpy (buf, " ");
		639
625	for (x = 0; x < op->contr->socket.mapx; x++)	640	for (x = 0; x < op->contr->ns->mapx; x++)
626	{	641	{
627	sprintf (buf2, "%2d", x);	642	sprintf (buf2, "%2d", x);
628	strcat (buf, buf2);	643	strcat (buf, buf2);
629	}	644	}
		645
630	new_draw_info (NDI_UNIQUE, 0, op, buf);	646	new_draw_info (NDI_UNIQUE, 0, op, buf);
		647
631	for (y = 0; y < op->contr->socket.mapy; y++)	648	for (y = 0; y < op->contr->ns->mapy; y++)
632	{	649	{
633	sprintf (buf, "%2d:", y);	650	sprintf (buf, "%2d:", y);
		651
634	for (x = 0; x < op->contr->socket.mapx; x++)	652	for (x = 0; x < op->contr->ns->mapx; x++)
635	{	653	{
636	sprintf (buf2, " %1d", op->contr->blocked_los[x][y]);	654	sprintf (buf2, " %1d", op->contr->blocked_los[x][y]);
637	strcat (buf, buf2);	655	strcat (buf, buf2);
638	}	656	}
		657
639	new_draw_info (NDI_UNIQUE, 0, op, buf);	658	new_draw_info (NDI_UNIQUE, 0, op, buf);
640	}	659	}
641	}	660	}
642		661
643	/*	662	/*
…		…
646	*/	665	*/
647		666
648	void	667	void
649	make_sure_seen (const object *op)	668	make_sure_seen (const object *op)
650	{	669	{
651	player *pl;	670	for_all_players (pl)
652
653	for (pl = first_player; pl; pl = pl->next)
654	if (pl->ob->map == op->map &&	671	if (pl->ob->map == op->map &&
655	pl->ob->y - pl->socket.mapy / 2 <= op->y &&	672	pl->ob->y - pl->ns->mapy / 2 <= op->y &&
656	pl->ob->y + pl->socket.mapy / 2 >= op->y && pl->ob->x - pl->socket.mapx / 2 <= op->x && pl->ob->x + pl->socket.mapx / 2 >= op->x)	673	pl->ob->y + pl->ns->mapy / 2 >= op->y && pl->ob->x - pl->ns->mapx / 2 <= op->x && pl->ob->x + pl->ns->mapx / 2 >= op->x)
657	pl->blocked_los[pl->socket.mapx / 2 + op->x - pl->ob->x][pl->socket.mapy / 2 + op->y - pl->ob->y] = 0;	674	pl->blocked_los[pl->ns->mapx / 2 + op->x - pl->ob->x][pl->ns->mapy / 2 + op->y - pl->ob->y] = 0;
658	}	675	}
659		676
660	/*	677	/*
661	* make_sure_not_seen: The object which is supposed to be visible through	678	* make_sure_not_seen: The object which is supposed to be visible through
662	* walls has just been removed from the map, so update the los of any	679	* walls has just been removed from the map, so update the los of any
…		…
664	*/	681	*/
665		682
666	void	683	void
667	make_sure_not_seen (const object *op)	684	make_sure_not_seen (const object *op)
668	{	685	{
669	player *pl;	686	for_all_players (pl)
670
671	for (pl = first_player; pl; pl = pl->next)
672	if (pl->ob->map == op->map &&	687	if (pl->ob->map == op->map &&
673	pl->ob->y - pl->socket.mapy / 2 <= op->y &&	688	pl->ob->y - pl->ns->mapy / 2 <= op->y &&
674	pl->ob->y + pl->socket.mapy / 2 >= op->y && pl->ob->x - pl->socket.mapx / 2 <= op->x && pl->ob->x + pl->socket.mapx / 2 >= op->x)	689	pl->ob->y + pl->ns->mapy / 2 >= op->y && pl->ob->x - pl->ns->mapx / 2 <= op->x && pl->ob->x + pl->ns->mapx / 2 >= op->x)
675	pl->do_los = 1;	690	pl->do_los = 1;
676	}	691	}

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.6 by root, Sat Sep 16 22:24:12 2006 UTC vs. Revision 1.32 by root, Thu Dec 4 03:48:19 2008 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.6 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.32 by root, Thu Dec 4 03:48:19 2008 UTC