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

Comparing deliantra/server/common/los.C (file contents):
Revision 1.4 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.36 by root, Mon Dec 8 15:40:13 2008 UTC

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

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.4 by root, Sun Sep 10 16:00:23 2006 UTC vs. Revision 1.36 by root, Mon Dec 8 15:40:13 2008 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.4 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.36 by root, Mon Dec 8 15:40:13 2008 UTC