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

Comparing deliantra/server/common/los.C (file contents):
Revision 1.26 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.37 by root, Thu Dec 18 02:49:22 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software; you can redistribute it and/or modify it	8	* Deliantra is free software: you can redistribute it and/or modify
9	* under the terms of the GNU General Public License as published by the Free	9	* it under the terms of the GNU General Public License as published by
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* the Free Software Foundation, either version 3 of the License, or
11	* 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, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* 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 along	18	* You should have received a copy of the GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	20	*
22	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */	24	/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */
26		25
27	#include <global.h>	26	#include <global.h>
28	#include <funcpoint.h>
29	#include <math.h>	27	#include <math.h>
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
38	#define SPACE_BLOCK 0.5	35	#define SPACE_BLOCK 0.5
39		36
40	typedef struct blstr	37	typedef struct blstr
41	{	38	{
42	int x[4], y[4];	39	int x[4], y[4];
89	/* since we are only doing the upper left quadrant, only	86	/* since we are only doing the upper left quadrant, only
90	* these spaces could possibly get blocked, since these	87	* these spaces could possibly get blocked, since these
91	* are the only ones further out that are still possibly in the	88	* are the only ones further out that are still possibly in the
92	* sightline.	89	* sightline.
93	*/	90	*/
94
95	void	91	void
96	init_block (void)	92	init_block (void)
97	{	93	{
98	int x, y, dx, dy, i;
99	static int block_x[3] = { -1, -1, 0 },	94	static int block_x[3] = { -1, -1, 0 },
100	block_y[3] = { -1, 0, -1 };	95	block_y[3] = { -1, 0, -1 };
101		96
102	for (x = 0; x < MAP_CLIENT_X; x++)	97	for (int x = 0; x < MAP_CLIENT_X; x++)
103	for (y = 0; y < MAP_CLIENT_Y; y++)	98	for (int y = 0; y < MAP_CLIENT_Y; y++)
104	block[x][y].index = 0;	99	block[x][y].index = 0;
105
106		100
107	/* The table should be symmetric, so only do the upper left	101	/* The table should be symmetric, so only do the upper left
108	* quadrant - makes the processing easier.	102	* quadrant - makes the processing easier.
109	*/	103	*/
110	for (x = 1; x <= MAP_CLIENT_X / 2; x++)	104	for (int x = 1; x <= MAP_CLIENT_X / 2; x++)
111	{	105	{
112	for (y = 1; y <= MAP_CLIENT_Y / 2; y++)	106	for (int y = 1; y <= MAP_CLIENT_Y / 2; y++)
113	{	107	{
114	for (i = 0; i < 3; i++)	108	for (int i = 0; i < 3; i++)
115	{	109	{
116	dx = x + block_x[i];	110	int dx = x + block_x[i];
117	dy = y + block_y[i];	111	int dy = y + block_y[i];
118		112
119	/* center space never blocks */	113	/* center space never blocks */
120	if (x == MAP_CLIENT_X / 2 && y == MAP_CLIENT_Y / 2)	114	if (x == MAP_CLIENT_X / 2 && y == MAP_CLIENT_Y / 2)
121	continue;	115	continue;
122		116
…		…
134	}	128	}
135	else	129	else
136	{	130	{
137	float d1, r, s, l;	131	float d1, r, s, l;
138		132
139	/* We use the algorihm that found out how close the point	133	/* We use the algorithm that found out how close the point
140	* (x,y) is to the line from dx,dy to the center of the viewable	134	* (x,y) is to the line from dx,dy to the center of the viewable
141	* area. l is the distance from x,y to the line.	135	* area. l is the distance from x,y to the line.
142	* r is more a curiosity - it lets us know what direction (left/right)	136	* r is more a curiosity - it lets us know what direction (left/right)
143	* the line is off	137	* the line is off
144	*/	138	*/
145		139
146	d1 = (float) (pow (MAP_CLIENT_X / 2 - dx, 2.f) + pow (MAP_CLIENT_Y / 2 - dy, 2.f));	140	d1 = (powf (MAP_CLIENT_X / 2 - dx, 2.f) + powf (MAP_CLIENT_Y / 2 - dy, 2.f));
147	r = (float) ((dy - y) * (dy - MAP_CLIENT_Y / 2) - (dx - x) * (MAP_CLIENT_X / 2 - dx)) / d1;	141	r = ((dy - y) * (dy - MAP_CLIENT_Y / 2) - (dx - x) * (MAP_CLIENT_X / 2 - dx)) / d1;
148	s = (float) ((dy - y) * (MAP_CLIENT_X / 2 - dx) - (dx - x) * (MAP_CLIENT_Y / 2 - dy)) / d1;	142	s = ((dy - y) * (MAP_CLIENT_X / 2 - dx) - (dx - x) * (MAP_CLIENT_Y / 2 - dy)) / d1;
149	l = FABS (sqrt (d1) * s);	143	l = fabs (sqrtf (d1) * s);
150		144
151	if (l <= SPACE_BLOCK)	145	if (l <= SPACE_BLOCK)
152	{	146	{
153	/* For simplicity, we mirror the coordinates to block the other	147	/* For simplicity, we mirror the coordinates to block the other
154	* quadrants.	148	* quadrants.
…		…
175	* In this way, the chain of visibility is set.	169	* In this way, the chain of visibility is set.
176	*/	170	*/
177	static void	171	static void
178	set_wall (object *op, int x, int y)	172	set_wall (object *op, int x, int y)
179	{	173	{
180	int i;
181
182	for (i = 0; i < block[x][y].index; i++)	174	for (int i = 0; i < block[x][y].index; i++)
183	{	175	{
184	int dx = block[x][y].x[i], dy = block[x][y].y[i], ax, ay;	176	int dx = block[x][y].x[i], dy = block[x][y].y[i], ax, ay;
185		177
186	/* ax, ay are the values as adjusted to be in the	178	/* ax, ay are the values as adjusted to be in the
187	* socket look structure.	179	* socket look structure.
…		…
196	#endif	188	#endif
197	/* we need to adjust to the fact that the socket	189	/* we need to adjust to the fact that the socket
198	* code wants the los to start from the 0,0	190	* code wants the los to start from the 0,0
199	* and not be relative to middle of los array.	191	* and not be relative to middle of los array.
200	*/	192	*/
201	op->contr->blocked_los[ax][ay] = 100;	193	op->contr->blocked_los[ax][ay] = LOS_BLOCKED;
202	set_wall (op, dx, dy);	194	set_wall (op, dx, dy);
203	}	195	}
204	}	196	}
205		197
206	/*	198	/*
207	* Used to initialise the array used by the LOS routines.	199	* Used to initialise the array used by the LOS routines.
208	* op is the object, x and y values based on MAP_CLIENT_X and Y.	200	* op is the object, x and y values based on MAP_CLIENT_X and Y.
209	* this is because they index the blocked[][] arrays.	201	* this is because they index the blocked[][] arrays.
210	*/	202	*/
211
212	static void	203	static void
213	check_wall (object *op, int x, int y)	204	check_wall (object *op, int x, int y)
214	{	205	{
215	int ax, ay;	206	int ax, ay;
216		207
…		…
234		225
235	/* If this space is already blocked, prune the processing - presumably	226	/* If this space is already blocked, prune the processing - presumably
236	* whatever has set this space to be blocked has done the work and already	227	* whatever has set this space to be blocked has done the work and already
237	* done the dependency chain.	228	* done the dependency chain.
238	*/	229	*/
239	if (op->contr->blocked_los[ax][ay] == 100)	230	if (op->contr->blocked_los[ax][ay] == LOS_BLOCKED)
240	return;	231	return;
241
242		232
243	if (get_map_flags (op->map, NULL, op->x + x - MAP_CLIENT_X / 2, op->y + y - MAP_CLIENT_Y / 2, NULL, NULL) & (P_BLOCKSVIEW \| P_OUT_OF_MAP))	233	if (get_map_flags (op->map, NULL, op->x + x - MAP_CLIENT_X / 2, op->y + y - MAP_CLIENT_Y / 2, NULL, NULL) & (P_BLOCKSVIEW \| P_OUT_OF_MAP))
244	set_wall (op, x, y);	234	set_wall (op, x, y);
245	}	235	}
246		236
…		…
248	* Clears/initialises the los-array associated to the player	238	* Clears/initialises the los-array associated to the player
249	* controlling the object.	239	* controlling the object.
250	*/	240	*/
251		241
252	void	242	void
253	clear_los (object *op)	243	clear_los (player *pl)
254	{	244	{
255	/* This is safer than using the ns->mapx, mapy because	245	/* This is safer than using the ns->mapx, mapy because
256	* we index the blocked_los as a 2 way array, so clearing	246	* we index the blocked_los as a 2 way array, so clearing
257	* the first z spaces may not not cover the spaces we are	247	* the first z spaces may not not cover the spaces we are
258	* actually going to use	248	* actually going to use
259	*/	249	*/
260	(void) memset ((void ) op->contr->blocked_los, 0, MAP_CLIENT_X MAP_CLIENT_Y);	250	memset (pl->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y);
261	}	251	}
262		252
263	/*	253	/*
264	* expand_sight goes through the array of what the given player is	254	* expand_sight goes through the array of what the given player is
265	* able to see, and expands the visible area a bit, so the player will,	255	* able to see, and expands the visible area a bit, so the player will,
266	* to a certain degree, be able to see into corners.	256	* to a certain degree, be able to see into corners.
267	* This is somewhat suboptimal, would be better to improve the formula.	257	* This is somewhat suboptimal, would be better to improve the formula.
268	*/	258	*/
269
270	static void	259	static void
271	expand_sight (object *op)	260	expand_sight (object *op)
272	{	261	{
273	int i, x, y, dx, dy;
274
275	for (x = 1; x < op->contr->ns->mapx - 1; x++) /* loop over inner squares */	262	for (int x = 1; x < op->contr->ns->mapx - 1; x++) /* loop over inner squares */
276	for (y = 1; y < op->contr->ns->mapy - 1; y++)	263	for (int y = 1; y < op->contr->ns->mapy - 1; y++)
277	{
278	if (!op->contr->blocked_los[x][y] &&	264	if (!op->contr->blocked_los[x][y] &&
279	!(get_map_flags (op->map, NULL,	265	!(get_map_flags (op->map, NULL,
280	op->x - op->contr->ns->mapx / 2 + x,	266	op->x - op->contr->ns->mapx / 2 + x,
281	op->y - op->contr->ns->mapy / 2 + y, NULL, NULL) & (P_BLOCKSVIEW \| P_OUT_OF_MAP)))	267	op->y - op->contr->ns->mapy / 2 + y, NULL, NULL) & (P_BLOCKSVIEW \| P_OUT_OF_MAP)))
282	{	268	{
283
284	for (i = 1; i <= 8; i += 1)	269	for (int i = 1; i <= 8; i += 1)
285	{ /* mark all directions */	270	{ /* mark all directions */
286	dx = x + freearr_x[i];	271	int dx = x + freearr_x[i];
287	dy = y + freearr_y[i];	272	int dy = y + freearr_y[i];
		273
288	if (op->contr->blocked_los[dx][dy] > 0) /* for any square blocked */	274	if (op->contr->blocked_los[dx][dy] > 0) /* for any square blocked */
289	op->contr->blocked_los[dx][dy] = -1;	275	op->contr->blocked_los[dx][dy] = -1;
290	}	276	}
291	}	277	}
292	}
293		278
294	if (op->map->darkness > 0) /* player is on a dark map */	279	if (op->map->darkness > 0) /* player is on a dark map */
295	expand_lighted_sight (op);	280	expand_lighted_sight (op);
296		281
297	/* clear mark squares */	282	/* clear mark squares */
298	for (x = 0; x < op->contr->ns->mapx; x++)	283	for (int x = 0; x < op->contr->ns->mapx; x++)
299	for (y = 0; y < op->contr->ns->mapy; y++)	284	for (int y = 0; y < op->contr->ns->mapy; y++)
300	if (op->contr->blocked_los[x][y] < 0)	285	if (op->contr->blocked_los[x][y] < 0)
301	op->contr->blocked_los[x][y] = 0;	286	op->contr->blocked_los[x][y] = 0;
302	}	287	}
303		288
304	/* returns true if op carries one or more lights	289	/* returns true if op carries one or more lights
305	* This is a trivial function now days, but it used to	290	* This is a trivial function now days, but it used to
306	* be a bit longer. Probably better for callers to just	291	* be a bit longer. Probably better for callers to just
307	* check the op->glow_radius instead of calling this.	292	* check the op->glow_radius instead of calling this.
308	*/	293	*/
309
310	int	294	int
311	has_carried_lights (const object *op)	295	has_carried_lights (const object *op)
312	{	296	{
313	/* op may glow! */	297	/* op may glow! */
314	if (op->glow_radius > 0)	298	if (op->glow_radius > 0)
315	return 1;	299	return 1;
316		300
317	return 0;	301	return 0;
318	}	302	}
319		303
		304	/* radius, distance => lightness adjust */
		305	static sint8 darkness[MAX_LIGHT_RADIUS * 2 + 1][MAX_LIGHT_RADIUS * 3 / 2 + 1];
		306
		307	static struct darkness_init
		308	{
		309	darkness_init ()
		310	{
		311	for (int radius = -MAX_LIGHT_RADIUS; radius <= MAX_LIGHT_RADIUS; ++radius)
		312	for (int distance = 0; distance <= MAX_LIGHT_RADIUS * 3 / 2; ++distance)
		313	{
		314	// max intensity
		315	int intensity = min (LOS_MAX, abs (radius) + 1);
		316
		317	// actual intensity
		318	intensity = max (0, lerp_rd (distance, 0, abs (radius) + 1, intensity, 0));
		319
		320	darkness [radius + MAX_LIGHT_RADIUS][distance] = radius < 0
		321	? min (3, intensity)
		322	: LOS_MAX - intensity;
		323	}
		324	}
		325	} darkness_init;
		326
320	static void	327	static void
321	expand_lighted_sight (object *op)	328	expand_lighted_sight (object *op)
322	{	329	{
323	int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1;	330	int x, y, darklevel, basex, basey, mflags, light, x1, y1;
324	maptile *m = op->map;	331	maptile *m = op->map;
325	sint16 nx, ny;	332	sint16 nx, ny;
326		333
327	darklevel = m->darkness;	334	darklevel = m->darkness;
328		335
329	/* If the player can see in the dark, lower the darklevel for him */	336	/* If the player can see in the dark, lower the darklevel for him */
330	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))	337	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
331	darklevel -= 2;	338	darklevel -= LOS_MAX / 2;
332		339
333	/* add light, by finding all (non-null) nearby light sources, then	340	/* add light, by finding all (non-null) nearby light sources, then
334	* mark those squares specially. If the darklevel<1, there is no	341	* mark those squares specially. If the darklevel<1, there is no
335	* reason to do this, so we skip this function	342	* reason to do this, so we skip this function
336	*/	343	*/
…		…
345	{	352	{
346	LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);	353	LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);
347	darklevel = MAX_DARKNESS;	354	darklevel = MAX_DARKNESS;
348	}	355	}
349		356
350	/* First, limit player furthest (unlighted) vision */	357	/* first, make everything totally dark */
351	for (x = 0; x < op->contr->ns->mapx; x++)	358	for (x = 0; x < op->contr->ns->mapx; x++)
352	for (y = 0; y < op->contr->ns->mapy; y++)	359	for (y = 0; y < op->contr->ns->mapy; y++)
353	if (op->contr->blocked_los[x][y] != 100)	360	if (op->contr->blocked_los[x][y] != LOS_BLOCKED)
354	op->contr->blocked_los[x][y] = MAX_LIGHT_RADII;	361	op->contr->blocked_los[x][y] = LOS_MAX;
355		362
356	/* the spaces[] darkness value contains the information we need.	363	int half_x = op->contr->ns->mapx / 2;
		364	int half_y = op->contr->ns->mapy / 2;
		365
		366	int min_x = op->x - half_x - MAX_LIGHT_RADIUS;
		367	int min_y = op->y - half_y - MAX_LIGHT_RADIUS;
		368	int max_x = op->x + half_x + MAX_LIGHT_RADIUS;
		369	int max_y = op->y + half_y + MAX_LIGHT_RADIUS;
		370
		371	int pass2 = 0; // negative lights have an extra pass
		372
		373	/*
357	* Only process the area of interest.	374	* Only process the area of interest.
358	* the basex, basey values represent the position in the op->contr->blocked_los	375	* the basex, basey values represent the position in the op->contr->blocked_los
359	* array. Its easier to just increment them here (and start with the right	376	* array. Its easier to just increment them here (and start with the right
360	* value) than to recalculate them down below.	377	* value) than to recalculate them down below.
361	*/	378	*/
362	for (x = (op->x - op->contr->ns->mapx / 2 - MAX_LIGHT_RADII), basex = -MAX_LIGHT_RADII;	379	for (int x = min_x, basex = -MAX_LIGHT_RADIUS; x <= max_x; x++, basex++)
363	x <= (op->x + op->contr->ns->mapx / 2 + MAX_LIGHT_RADII); x++, basex++)	380	for (int y = min_y, basey = -MAX_LIGHT_RADIUS; y <= max_y; y++, basey++)
364	{
365
366	for (y = (op->y - op->contr->ns->mapy / 2 - MAX_LIGHT_RADII), basey = -MAX_LIGHT_RADII;
367	y <= (op->y + op->contr->ns->mapy / 2 + MAX_LIGHT_RADII); y++, basey++)
368	{	381	{
		382	maptile *m = op->map;
		383	sint16 nx = x;
		384	sint16 ny = y;
		385
		386	if (!xy_normalise (m, nx, ny))
		387	continue;
		388
		389	mapspace &ms = m->at (nx, ny);
		390	ms.update ();
		391	sint8 light = ms.light;
		392
		393	if (expect_false (light))
		394	if (light < 0)
		395	pass2 = 1;
		396	else
		397	{
		398	/* This space is providing light, so we need to brighten up the
		399	* spaces around here.
		400	*/
		401	const sint8 *darkness_table = darkness [light + MAX_LIGHT_RADIUS];
		402
		403	for (int ax = max (0, basex - light); ax <= min (basex + light, op->contr->ns->mapx - 1); ax++)
		404	for (int ay = max (0, basey - light); ay <= min (basey + light, op->contr->ns->mapy - 1); ay++)
		405	if (op->contr->blocked_los[ax][ay] != LOS_BLOCKED)
		406	min_it (op->contr->blocked_los[ax][ay], darkness_table [idistance (ax - basex, ay - basey)]);
		407	}
		408	}
		409
		410	// psosibly do 2nd pass for rare negative glow radii
		411	if (expect_false (pass2))
		412	for (x = min_x, basex = -MAX_LIGHT_RADIUS; x <= max_x; x++, basex++)
		413	for (y = min_y, basey = -MAX_LIGHT_RADIUS; y <= max_y; y++, basey++)
		414	{
369	m = op->map;	415	maptile *m = op->map;
370	nx = x;	416	sint16 nx = x;
371	ny = y;	417	sint16 ny = y;
372		418
373	mflags = get_map_flags (m, &m, nx, ny, &nx, &ny);	419	if (!xy_normalise (m, nx, ny))
374
375	if (mflags & P_OUT_OF_MAP)
376	continue;	420	continue;
377		421
378	/* This space is providing light, so we need to brighten up the	422	mapspace &ms = m->at (nx, ny);
379	* spaces around here.	423	ms.update ();
380	*/	424	sint8 light = ms.light;
381	light = GET_MAP_LIGHT (m, nx, ny);	425
382	if (light != 0)	426	if (expect_false (light < 0))
383	{	427	{
384	#if 0	428	const sint8 *darkness_table = darkness [light + MAX_LIGHT_RADIUS];
385	LOG (llevDebug, "expand_lighted_sight: Found light at x=%d, y=%d, basex=%d, basey=%d\n", x, y, basex, basey);
386	#endif
387	for (ax = basex - light; ax <= basex + light; ax++)
388	{
389	if (ax < 0 \|\| ax >= op->contr->ns->mapx)
390	continue;
391		429
392	for (ay = basey - light; ay <= basey + light; ay++)	430	for (int ax = max (0, basex + light); ax <= min (basex - light, op->contr->ns->mapx - 1); ax++)
393	{	431	for (int ay = max (0, basey + light); ay <= min (basey - light, op->contr->ns->mapy - 1); ay++)
394	if (ay < 0 \|\| ay >= op->contr->ns->mapy)
395	continue;
396
397	/* If the space is fully blocked, do nothing. Otherwise, we
398	* brighten the space. The further the light is away from the
399	* source (basex-x), the less effect it has. Though light used
400	* to dim in a square manner, it now dims in a circular manner
401	* using the the pythagorean theorem. glow_radius still
402	* represents the radius
403	*/
404	if (op->contr->blocked_los[ax][ay] != 100)	432	if (op->contr->blocked_los[ax][ay] != LOS_BLOCKED)
405	{	433	max_it (op->contr->blocked_los[ax][ay], darkness_table [idistance (ax - basex, ay - basey)]);
406	x1 = abs (basex - ax) * abs (basex - ax);
407	y1 = abs (basey - ay) * abs (basey - ay);
408
409	if (light > 0) op->contr->blocked_los[ax][ay] -= max (light - isqrt (x1 + y1), 0);
410	if (light < 0) op->contr->blocked_los[ax][ay] -= min (light + isqrt (x1 + y1), 0);
411	}
412	}
413	}
414	}	434	}
415	}	435	}
416	}
417		436
418	/* Outdoor should never really be completely pitch black dark like	437	/* Outdoor should never really be completely pitch black dark like
419	* a dungeon, so let the player at least see a little around themselves	438	* a dungeon, so let the player at least see a little around themselves
420	*/	439	*/
421	if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3))	440	if (op->map->outdoor && darklevel > MAX_DARKNESS - 3)
422	{	441	{
423	if (op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] > (MAX_DARKNESS - 3))	442	if (op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] > (LOS_MAX - 3))
424	op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = MAX_DARKNESS - 3;	443	op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = LOS_MAX - 3;
425		444
426	for (x = -1; x <= 1; x++)	445	for (x = -1; x <= 1; x++)
427	for (y = -1; y <= 1; y++)	446	for (y = -1; y <= 1; y++)
428	{
429	if (op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] > (MAX_DARKNESS - 2))	447	if (op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] > (LOS_MAX - 2))
430	op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] = MAX_DARKNESS - 2;	448	op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] = LOS_MAX - 2;
431	}
432	}	449	}
433		450
434	/* grant some vision to the player, based on the darklevel */	451	/* grant some vision to the player, based on the darklevel */
435	for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)	452	for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)
436	for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++)	453	for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++)
437	if (!(op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] == 100))	454	if (!(op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] == LOS_BLOCKED))
438	op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] -=	455	op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] -=
439	MAX (0, 6 - darklevel - MAX (abs (x), abs (y)));	456	max (0, 6 - darklevel - max (abs (x), abs (y)));
440	}	457	}
441		458
442	/* blinded_sight() - sets all veiwable squares to blocked except	459	/* blinded_sight() - sets all viewable squares to blocked except
443	* for the one the central one that the player occupies. A little	460	* for the one the central one that the player occupies. A little
444	* odd that you can see yourself (and what your standing on), but	461	* odd that you can see yourself (and what your standing on), but
445	* really need for any reasonable game play.	462	* really need for any reasonable game play.
446	*/	463	*/
447	static void	464	static void
…		…
449	{	466	{
450	int x, y;	467	int x, y;
451		468
452	for (x = 0; x < op->contr->ns->mapx; x++)	469	for (x = 0; x < op->contr->ns->mapx; x++)
453	for (y = 0; y < op->contr->ns->mapy; y++)	470	for (y = 0; y < op->contr->ns->mapy; y++)
454	op->contr->blocked_los[x][y] = 100;	471	op->contr->blocked_los[x][y] = LOS_BLOCKED;
455		472
456	op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = 0;	473	op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = 0;
457	}	474	}
458		475
459	/*	476	/*
460	* update_los() recalculates the array which specifies what is	477	* update_los() recalculates the array which specifies what is
461	* visible for the given player-object.	478	* visible for the given player-object.
462	*/	479	*/
463
464	void	480	void
465	update_los (object *op)	481	update_los (object *op)
466	{	482	{
467	int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y;	483	int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y;
468		484
469	if (QUERY_FLAG (op, FLAG_REMOVED))	485	if (QUERY_FLAG (op, FLAG_REMOVED))
470	return;	486	return;
471		487
472	clear_los (op);	488	clear_los (op->contr);
		489
473	if (QUERY_FLAG (op, FLAG_WIZ) /* \|\|XRAYS(op) */ )	490	if (QUERY_FLAG (op, FLAG_WIZ) /* \|\|XRAYS(op) */ )
474	return;	491	return;
475		492
476	/* For larger maps, this is more efficient than the old way which	493	/* For larger maps, this is more efficient than the old way which
477	* used the chaining of the block array. Since many space views could	494	* used the chaining of the block array. Since many space views could

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.26 by root, Mon May 28 21:21:40 2007 UTC vs. Revision 1.37 by root, Thu Dec 18 02:49:22 2008 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.26 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.37 by root, Thu Dec 18 02:49:22 2008 UTC