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

Comparing deliantra/server/common/los.C (file contents):
Revision 1.28 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.38 by root, Thu Dec 18 05:13:38 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	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	8	* Deliantra 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 3 of the License, or	10	* the Free Software Foundation, either version 3 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,
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, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* 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>
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		28
30	/* 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.
31	* 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
32	* that blocks half the view (0.0 is complete block) will	31	* that blocks half the view (0.0 is complete block) will
33	* block view in our tables.	32	* block view in our tables.
34	* .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.
35	*/	34	*/
36
37	#define SPACE_BLOCK 0.5	35	#define SPACE_BLOCK 0.5
38		36
39	typedef struct blstr	37	typedef struct blstr
40	{	38	{
41	int x[4], y[4];	39	int x[4], y[4];
…		…
88	/* since we are only doing the upper left quadrant, only	86	/* since we are only doing the upper left quadrant, only
89	* these spaces could possibly get blocked, since these	87	* these spaces could possibly get blocked, since these
90	* 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
91	* sightline.	89	* sightline.
92	*/	90	*/
93
94	void	91	void
95	init_block (void)	92	init_block (void)
96	{	93	{
97	int x, y, dx, dy, i;
98	static int block_x[3] = { -1, -1, 0 },	94	static int block_x[3] = { -1, -1, 0 },
99	block_y[3] = { -1, 0, -1 };	95	block_y[3] = { -1, 0, -1 };
100		96
101	for (x = 0; x < MAP_CLIENT_X; x++)	97	for (int x = 0; x < MAP_CLIENT_X; x++)
102	for (y = 0; y < MAP_CLIENT_Y; y++)	98	for (int y = 0; y < MAP_CLIENT_Y; y++)
103	block[x][y].index = 0;	99	block[x][y].index = 0;
104
105		100
106	/* The table should be symmetric, so only do the upper left	101	/* The table should be symmetric, so only do the upper left
107	* quadrant - makes the processing easier.	102	* quadrant - makes the processing easier.
108	*/	103	*/
109	for (x = 1; x <= MAP_CLIENT_X / 2; x++)	104	for (int x = 1; x <= MAP_CLIENT_X / 2; x++)
110	{	105	{
111	for (y = 1; y <= MAP_CLIENT_Y / 2; y++)	106	for (int y = 1; y <= MAP_CLIENT_Y / 2; y++)
112	{	107	{
113	for (i = 0; i < 3; i++)	108	for (int i = 0; i < 3; i++)
114	{	109	{
115	dx = x + block_x[i];	110	int dx = x + block_x[i];
116	dy = y + block_y[i];	111	int dy = y + block_y[i];
117		112
118	/* center space never blocks */	113	/* center space never blocks */
119	if (x == MAP_CLIENT_X / 2 && y == MAP_CLIENT_Y / 2)	114	if (x == MAP_CLIENT_X / 2 && y == MAP_CLIENT_Y / 2)
120	continue;	115	continue;
121		116
…		…
133	}	128	}
134	else	129	else
135	{	130	{
136	float d1, r, s, l;	131	float d1, r, s, l;
137		132
138	/* We use the algorihm that found out how close the point	133	/* We use the algorithm that found out how close the point
139	* (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
140	* area. l is the distance from x,y to the line.	135	* area. l is the distance from x,y to the line.
141	* 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)
142	* the line is off	137	* the line is off
143	*/	138	*/
144		139
145	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));
146	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;
147	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;
148	l = FABS (sqrt (d1) * s);	143	l = fabs (sqrtf (d1) * s);
149		144
150	if (l <= SPACE_BLOCK)	145	if (l <= SPACE_BLOCK)
151	{	146	{
152	/* For simplicity, we mirror the coordinates to block the other	147	/* For simplicity, we mirror the coordinates to block the other
153	* quadrants.	148	* quadrants.
…		…
174	* In this way, the chain of visibility is set.	169	* In this way, the chain of visibility is set.
175	*/	170	*/
176	static void	171	static void
177	set_wall (object *op, int x, int y)	172	set_wall (object *op, int x, int y)
178	{	173	{
179	int i;
180
181	for (i = 0; i < block[x][y].index; i++)	174	for (int i = 0; i < block[x][y].index; i++)
182	{	175	{
183	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;
184		177
185	/* ax, ay are the values as adjusted to be in the	178	/* ax, ay are the values as adjusted to be in the
186	* socket look structure.	179	* socket look structure.
…		…
195	#endif	188	#endif
196	/* we need to adjust to the fact that the socket	189	/* we need to adjust to the fact that the socket
197	* code wants the los to start from the 0,0	190	* code wants the los to start from the 0,0
198	* and not be relative to middle of los array.	191	* and not be relative to middle of los array.
199	*/	192	*/
200	op->contr->blocked_los[ax][ay] = 100;	193	op->contr->blocked_los[ax][ay] = LOS_BLOCKED;
201	set_wall (op, dx, dy);	194	set_wall (op, dx, dy);
202	}	195	}
203	}	196	}
204		197
205	/*	198	/*
206	* Used to initialise the array used by the LOS routines.	199	* Used to initialise the array used by the LOS routines.
207	* 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.
208	* this is because they index the blocked[][] arrays.	201	* this is because they index the blocked[][] arrays.
209	*/	202	*/
210
211	static void	203	static void
212	check_wall (object *op, int x, int y)	204	check_wall (object *op, int x, int y)
213	{	205	{
214	int ax, ay;	206	int ax, ay;
215		207
…		…
233		225
234	/* If this space is already blocked, prune the processing - presumably	226	/* If this space is already blocked, prune the processing - presumably
235	* 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
236	* done the dependency chain.	228	* done the dependency chain.
237	*/	229	*/
238	if (op->contr->blocked_los[ax][ay] == 100)	230	if (op->contr->blocked_los[ax][ay] == LOS_BLOCKED)
239	return;	231	return;
240
241		232
242	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))
243	set_wall (op, x, y);	234	set_wall (op, x, y);
244	}	235	}
245		236
…		…
263	* 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
264	* 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,
265	* to a certain degree, be able to see into corners.	256	* to a certain degree, be able to see into corners.
266	* This is somewhat suboptimal, would be better to improve the formula.	257	* This is somewhat suboptimal, would be better to improve the formula.
267	*/	258	*/
268
269	static void	259	static void
270	expand_sight (object *op)	260	expand_sight (object *op)
271	{	261	{
272	int i, x, y, dx, dy;
273
274	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 */
275	for (y = 1; y < op->contr->ns->mapy - 1; y++)	263	for (int y = 1; y < op->contr->ns->mapy - 1; y++)
276	{
277	if (!op->contr->blocked_los[x][y] &&	264	if (!op->contr->blocked_los[x][y] &&
278	!(get_map_flags (op->map, NULL,	265	!(get_map_flags (op->map, NULL,
279	op->x - op->contr->ns->mapx / 2 + x,	266	op->x - op->contr->ns->mapx / 2 + x,
280	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)))
281	{	268	{
282
283	for (i = 1; i <= 8; i += 1)	269	for (int i = 1; i <= 8; i += 1)
284	{ /* mark all directions */	270	{ /* mark all directions */
285	dx = x + freearr_x[i];	271	int dx = x + freearr_x[i];
286	dy = y + freearr_y[i];	272	int dy = y + freearr_y[i];
		273
287	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 */
288	op->contr->blocked_los[dx][dy] = -1;	275	op->contr->blocked_los[dx][dy] = -1;
289	}	276	}
290	}	277	}
291	}
292		278
293	if (op->map->darkness > 0) /* player is on a dark map */	279	if (op->map->darkness > 0) /* player is on a dark map */
294	expand_lighted_sight (op);	280	expand_lighted_sight (op);
295		281
296	/* clear mark squares */	282	/* clear mark squares */
297	for (x = 0; x < op->contr->ns->mapx; x++)	283	for (int x = 0; x < op->contr->ns->mapx; x++)
298	for (y = 0; y < op->contr->ns->mapy; y++)	284	for (int y = 0; y < op->contr->ns->mapy; y++)
299	if (op->contr->blocked_los[x][y] < 0)	285	if (op->contr->blocked_los[x][y] < 0)
300	op->contr->blocked_los[x][y] = 0;	286	op->contr->blocked_los[x][y] = 0;
301	}	287	}
302		288
303	/* returns true if op carries one or more lights	289	/* returns true if op carries one or more lights
304	* This is a trivial function now days, but it used to	290	* This is a trivial function now days, but it used to
305	* be a bit longer. Probably better for callers to just	291	* be a bit longer. Probably better for callers to just
306	* check the op->glow_radius instead of calling this.	292	* check the op->glow_radius instead of calling this.
307	*/	293	*/
308
309	int	294	int
310	has_carried_lights (const object *op)	295	has_carried_lights (const object *op)
311	{	296	{
312	/* op may glow! */	297	/* op may glow! */
313	if (op->glow_radius > 0)	298	if (op->glow_radius > 0)
314	return 1;	299	return 1;
315		300
316	return 0;	301	return 0;
317	}	302	}
318		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
319	static void	327	static void
320	expand_lighted_sight (object *op)	328	expand_lighted_sight (object *op)
321	{	329	{
322	int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1;	330	int x, y, darklevel, basex, basey, mflags, light, x1, y1;
323	maptile *m = op->map;	331	maptile *m = op->map;
324	sint16 nx, ny;	332	sint16 nx, ny;
325		333
326	darklevel = m->darkness;	334	darklevel = m->darkness;
327		335
328	/* 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 */
329	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))	337	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
330	darklevel -= 2;	338	darklevel -= LOS_MAX / 2;
331		339
332	/* add light, by finding all (non-null) nearby light sources, then	340	/* add light, by finding all (non-null) nearby light sources, then
333	* mark those squares specially. If the darklevel<1, there is no	341	* mark those squares specially. If the darklevel<1, there is no
334	* reason to do this, so we skip this function	342	* reason to do this, so we skip this function
335	*/	343	*/
…		…
344	{	352	{
345	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);
346	darklevel = MAX_DARKNESS;	354	darklevel = MAX_DARKNESS;
347	}	355	}
348		356
349	/* First, limit player furthest (unlighted) vision */	357	/* first, make everything totally dark */
350	for (x = 0; x < op->contr->ns->mapx; x++)	358	for (x = 0; x < op->contr->ns->mapx; x++)
351	for (y = 0; y < op->contr->ns->mapy; y++)	359	for (y = 0; y < op->contr->ns->mapy; y++)
352	if (op->contr->blocked_los[x][y] != 100)	360	if (op->contr->blocked_los[x][y] != LOS_BLOCKED)
353	op->contr->blocked_los[x][y] = MAX_LIGHT_RADII;	361	op->contr->blocked_los[x][y] = LOS_MAX;
354		362
355	/* 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	/*
356	* Only process the area of interest.	374	* Only process the area of interest.
357	* 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
358	* 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
359	* value) than to recalculate them down below.	377	* value) than to recalculate them down below.
360	*/	378	*/
361	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++)
362	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++)
363	{
364
365	for (y = (op->y - op->contr->ns->mapy / 2 - MAX_LIGHT_RADII), basey = -MAX_LIGHT_RADII;
366	y <= (op->y + op->contr->ns->mapy / 2 + MAX_LIGHT_RADII); y++, basey++)
367	{	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	// possibly 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	{
368	m = op->map;	415	maptile *m = op->map;
369	nx = x;	416	sint16 nx = x;
370	ny = y;	417	sint16 ny = y;
371		418
372	mflags = get_map_flags (m, &m, nx, ny, &nx, &ny);	419	if (!xy_normalise (m, nx, ny))
373
374	if (mflags & P_OUT_OF_MAP)
375	continue;	420	continue;
376		421
377	/* This space is providing light, so we need to brighten up the	422	mapspace &ms = m->at (nx, ny);
378	* spaces around here.	423	ms.update ();
379	*/	424	sint8 light = ms.light;
380	light = GET_MAP_LIGHT (m, nx, ny);	425
381	if (light != 0)	426	if (expect_false (light < 0))
382	{	427	{
383	#if 0	428	const sint8 *darkness_table = darkness [light + MAX_LIGHT_RADIUS];
384	LOG (llevDebug, "expand_lighted_sight: Found light at x=%d, y=%d, basex=%d, basey=%d\n", x, y, basex, basey);
385	#endif
386	for (ax = basex - light; ax <= basex + light; ax++)
387	{
388	if (ax < 0 \|\| ax >= op->contr->ns->mapx)
389	continue;
390		429
391	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++)
392	{	431	for (int ay = max (0, basey + light); ay <= min (basey - light, op->contr->ns->mapy - 1); ay++)
393	if (ay < 0 \|\| ay >= op->contr->ns->mapy)
394	continue;
395
396	/* If the space is fully blocked, do nothing. Otherwise, we
397	* brighten the space. The further the light is away from the
398	* source (basex-x), the less effect it has. Though light used
399	* to dim in a square manner, it now dims in a circular manner
400	* using the the pythagorean theorem. glow_radius still
401	* represents the radius
402	*/
403	if (op->contr->blocked_los[ax][ay] != 100)	432	if (op->contr->blocked_los[ax][ay] != LOS_BLOCKED)
404	{	433	max_it (op->contr->blocked_los[ax][ay], darkness_table [idistance (ax - basex, ay - basey)]);
405	x1 = abs (basex - ax) * abs (basex - ax);
406	y1 = abs (basey - ay) * abs (basey - ay);
407
408	if (light > 0) op->contr->blocked_los[ax][ay] -= max (light - isqrt (x1 + y1), 0);
409	if (light < 0) op->contr->blocked_los[ax][ay] -= min (light + isqrt (x1 + y1), 0);
410	}
411	}
412	}
413	}	434	}
414	}	435	}
415	}
416		436
417	/* Outdoor should never really be completely pitch black dark like	437	/* Outdoor should never really be completely pitch black dark like
418	* 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
419	*/	439	*/
420	if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3))	440	if (op->map->outdoor && darklevel > MAX_DARKNESS - 3)
421	{	441	{
422	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))
423	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;
424		444
425	for (x = -1; x <= 1; x++)	445	for (x = -1; x <= 1; x++)
426	for (y = -1; y <= 1; y++)	446	for (y = -1; y <= 1; y++)
427	{
428	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))
429	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;
430	}
431	}	449	}
432		450
433	/* grant some vision to the player, based on the darklevel */	451	/* grant some vision to the player, based on the darklevel */
434	for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)	452	for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)
435	for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++)	453	for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++)
436	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))
437	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] -=
438	MAX (0, 6 - darklevel - MAX (abs (x), abs (y)));	456	max (0, 6 - darklevel - max (abs (x), abs (y)));
439	}	457	}
440		458
441	/* blinded_sight() - sets all veiwable squares to blocked except	459	/* blinded_sight() - sets all viewable squares to blocked except
442	* 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
443	* 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
444	* really need for any reasonable game play.	462	* really need for any reasonable game play.
445	*/	463	*/
446	static void	464	static void
…		…
448	{	466	{
449	int x, y;	467	int x, y;
450		468
451	for (x = 0; x < op->contr->ns->mapx; x++)	469	for (x = 0; x < op->contr->ns->mapx; x++)
452	for (y = 0; y < op->contr->ns->mapy; y++)	470	for (y = 0; y < op->contr->ns->mapy; y++)
453	op->contr->blocked_los[x][y] = 100;	471	op->contr->blocked_los[x][y] = LOS_BLOCKED;
454		472
455	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;
456	}	474	}
457		475
458	/*	476	/*

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.28 by root, Sun Jul 1 05:00:17 2007 UTC vs. Revision 1.38 by root, Thu Dec 18 05:13:38 2008 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.28 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.38 by root, Thu Dec 18 05:13:38 2008 UTC