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

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

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

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.3 by root, Sun Sep 3 00:18:40 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.3 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.36 by root, Mon Dec 8 15:40:13 2008 UTC