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

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

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs. Revision 1.35 by root, Thu Dec 4 22:32:41 2008 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.35 by root, Thu Dec 4 22:32:41 2008 UTC