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

Comparing deliantra/server/common/los.C (file contents):
Revision 1.34 by root, Thu Dec 4 03:52:00 2008 UTC vs.
Revision 1.65 by root, Wed Nov 4 18:17:57 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	5	*
8	* Deliantra is free software: you can redistribute it and/or modify	6	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	7	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	8	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	9	* option) any later version.
12	*	10	*
13	* This program is distributed in the hope that it will be useful,	11	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	14	* GNU General Public License for more details.
17	*	15	*
18	* You should have received a copy of the GNU General Public License	16	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	17	* and the GNU General Public License along with this program. If not, see
		18	* <http://www.gnu.org/licenses/>.
20	*	19	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	20	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	21	*/
23		22
24	/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */
25
26	#include <global.h>	23	#include <global.h>
27	#include <math.h>	24	#include <cmath>
28		25
29	/* Distance must be less than this for the object to be blocked.	26	#define SEE_IN_DARK_RADIUS 2
30	* An object is 1.0 wide, so if set to 0.5, it means the object	27	#define MAX_VISION 10 // maximum visible radius
31	* that blocks half the view (0.0 is complete block) will
32	* block view in our tables.
33	* .4 or less lets you see through walls. .5 is about right.
34	*/
35		28
36	#define SPACE_BLOCK 0.5	29	// los flags
37	#define MAX_DARKNESS_LOS 4 /* 4 == totally dark */	30	enum {
		31	FLG_XI = 0x01, // we have an x-parent
		32	FLG_YI = 0x02, // we have an y-parent
		33	FLG_BLOCKED = 0x04, // this space blocks the view
		34	FLG_QUEUED = 0x80 // already queued in queue, or border
		35	};
38		36
39	typedef struct blstr	37	struct los_info
40	{	38	{
41	int x[4], y[4];	39	uint8 flags; // FLG_xxx
42	int index;	40	uint8 culled; // culled from "tree"
43	} blocks;	41	uint8 visible;
		42	uint8 pad0;
44		43
45	// 31/32 == a speed hack	44	sint8 xo, yo; // obscure angle
46	// we would like to use 32 for speed, but the code loops endlessly	45	sint8 xe, ye; // angle deviation
47	// then, reason not yet identified, so only make the array use 32,	46	};
48	// not the define's.
49	blocks block[MAP_CLIENT_X][MAP_CLIENT_Y == 31 ? 32 : MAP_CLIENT_Y];
50		47
51	static void expand_lighted_sight (object *op);	48	// temporary storage for the los algorithm,
		49	// one los_info for each lightable map space
		50	static los_info los[MAP_CLIENT_X][MAP_CLIENT_Y];
52		51
53	/*	52	struct point
54	* Used to initialise the array used by the LOS routines.
55	* What this sets if that x,y blocks the view of bx,by
56	* This then sets up a relation - for example, something
57	* at 5,4 blocks view at 5,3 which blocks view at 5,2
58	* etc. So when we check 5,4 and find it block, we have
59	* the data to know that 5,3 and 5,2 and 5,1 should also
60	* be blocked.
61	*/
62
63	static void
64	set_block (int x, int y, int bx, int by)
65	{	53	{
66	int index = block[x][y].index, i;
67
68	/* Due to flipping, we may get duplicates - better safe than sorry.
69	*/
70	for (i = 0; i < index; i++)
71	{
72	if (block[x][y].x[i] == bx && block[x][y].y[i] == by)
73	return;
74	}
75
76	block[x][y].x[index] = bx;
77	block[x][y].y[index] = by;
78	block[x][y].index++;
79	#ifdef LOS_DEBUG
80	LOG (llevDebug, "setblock: added %d %d -> %d %d (%d)\n", x, y, bx, by, block[x][y].index);
81	#endif
82	}
83
84	/*
85	* initialises the array used by the LOS routines.
86	*/
87
88	/* since we are only doing the upper left quadrant, only
89	* these spaces could possibly get blocked, since these
90	* are the only ones further out that are still possibly in the
91	* sightline.
92	*/
93
94	void
95	init_block (void)
96	{
97	int x, y, dx, dy, i;
98	static int block_x[3] = { -1, -1, 0 },
99	block_y[3] = { -1, 0, -1 };
100
101	for (x = 0; x < MAP_CLIENT_X; x++)
102	for (y = 0; y < MAP_CLIENT_Y; y++)
103	block[x][y].index = 0;
104
105
106	/* The table should be symmetric, so only do the upper left
107	* quadrant - makes the processing easier.
108	*/
109	for (x = 1; x <= MAP_CLIENT_X / 2; x++)
110	{
111	for (y = 1; y <= MAP_CLIENT_Y / 2; y++)
112	{
113	for (i = 0; i < 3; i++)
114	{
115	dx = x + block_x[i];
116	dy = y + block_y[i];
117
118	/* center space never blocks */
119	if (x == MAP_CLIENT_X / 2 && y == MAP_CLIENT_Y / 2)
120	continue;
121
122	/* If its a straight line, its blocked */
123	if ((dx == x && x == MAP_CLIENT_X / 2) \|\| (dy == y && y == MAP_CLIENT_Y / 2))
124	{
125	/* For simplicity, we mirror the coordinates to block the other
126	* quadrants.
127	*/
128	set_block (x, y, dx, dy);
129	if (x == MAP_CLIENT_X / 2)
130	set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1);
131	else if (y == MAP_CLIENT_Y / 2)
132	set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);
133	}
134	else
135	{
136	float d1, r, s, l;
137
138	/* We use the algorihm that found out how close the point
139	* (x,y) is to the line from dx,dy to the center of the viewable
140	* area. l is the distance from x,y to the line.
141	* r is more a curiosity - it lets us know what direction (left/right)
142	* the line is off
143	*/
144
145	d1 = (float) (pow (MAP_CLIENT_X / 2 - dx, 2.f) + pow (MAP_CLIENT_Y / 2 - dy, 2.f));
146	r = (float) ((dy - y) * (dy - MAP_CLIENT_Y / 2) - (dx - x) * (MAP_CLIENT_X / 2 - dx)) / d1;
147	s = (float) ((dy - y) * (MAP_CLIENT_X / 2 - dx) - (dx - x) * (MAP_CLIENT_Y / 2 - dy)) / d1;
148	l = FABS (sqrt (d1) * s);
149
150	if (l <= SPACE_BLOCK)
151	{
152	/* For simplicity, we mirror the coordinates to block the other
153	* quadrants.
154	*/
155	set_block (x, y, dx, dy);
156	set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);
157	set_block (x, MAP_CLIENT_Y - y - 1, dx, 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);
159	}
160	}
161	}
162	}
163	}
164	}
165
166	/*
167	* Used to initialise the array used by the LOS routines.
168	* x,y are indexes into the blocked[][] array.
169	* This recursively sets the blocked line of sight view.
170	* From the blocked[][] array, we know for example
171	* that if some particular space is blocked, it blocks
172	* the view of the spaces 'behind' it, and those blocked
173	* spaces behind it may block other spaces, etc.
174	* In this way, the chain of visibility is set.
175	*/
176	static void
177	set_wall (object *op, int x, int y)
178	{
179	int i;
180
181	for (i = 0; i < block[x][y].index; i++)
182	{
183	int dx = block[x][y].x[i], dy = block[x][y].y[i], ax, ay;
184
185	/* ax, ay are the values as adjusted to be in the
186	* socket look structure.
187	*/
188	ax = dx - (MAP_CLIENT_X - op->contr->ns->mapx) / 2;
189	ay = dy - (MAP_CLIENT_Y - op->contr->ns->mapy) / 2;
190
191	if (ax < 0 \|\| ax >= op->contr->ns->mapx \|\| ay < 0 \|\| ay >= op->contr->ns->mapy)
192	continue;
193	#if 0
194	LOG (llevDebug, "blocked %d %d -> %d %d\n", dx, dy, ax, ay);
195	#endif
196	/* we need to adjust to the fact that the socket
197	* code wants the los to start from the 0,0
198	* and not be relative to middle of los array.
199	*/
200	op->contr->blocked_los[ax][ay] = 100;
201	set_wall (op, dx, dy);
202	}
203	}
204
205	/*
206	* Used to initialise the array used by the LOS routines.
207	* op is the object, x and y values based on MAP_CLIENT_X and Y.
208	* this is because they index the blocked[][] arrays.
209	*/
210
211	static void
212	check_wall (object *op, int x, int y)
213	{
214	int ax, ay;	54	sint8 x, y;
		55	};
215		56
216	if (!block[x][y].index)	57	// minimum size, but must be a power of two
217	return;	58	#define QUEUE_LENGTH ((MAP_CLIENT_X + MAP_CLIENT_Y) * 2)
218		59
219	/* ax, ay are coordinates as indexed into the look window */	60	// a queue of spaces to calculate
220	ax = x - (MAP_CLIENT_X - op->contr->ns->mapx) / 2;	61	static point queue [QUEUE_LENGTH];
221	ay = y - (MAP_CLIENT_Y - op->contr->ns->mapy) / 2;	62	static int q1, q2; // queue start, end
222
223	/* If the converted coordinates are outside the viewable
224	* area for the client, return now.
225	*/
226	if (ax < 0 \|\| ay < 0 \|\| ax >= op->contr->ns->mapx \|\| ay >= op->contr->ns->mapy)
227	return;
228
229	#if 0
230	LOG (llevDebug, "check_wall, ax,ay=%d, %d x,y = %d, %d blocksview = %d, %d\n",
231	ax, ay, x, y, op->x + x - MAP_CLIENT_X / 2, op->y + y - MAP_CLIENT_Y / 2);
232	#endif
233
234	/* If this space is already blocked, prune the processing - presumably
235	* whatever has set this space to be blocked has done the work and already
236	* done the dependency chain.
237	*/
238	if (op->contr->blocked_los[ax][ay] == 100)
239	return;
240
241
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))
243	set_wall (op, x, y);
244	}
245		63
246	/*	64	/*
247	* Clears/initialises the los-array associated to the player	65	* Clears/initialises the los-array associated to the player
248	* controlling the object.	66	* controlling the object.
249	*/	67	*/
250
251	void	68	void
252	clear_los (player *pl)	69	player::clear_los (sint8 value)
253	{	70	{
254	/* This is safer than using the ns->mapx, mapy because	71	memset (los, value, sizeof (los));
255	* we index the blocked_los as a 2 way array, so clearing
256	* the first z spaces may not not cover the spaces we are
257	* actually going to use
258	*/
259	memset (pl->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y);
260	}	72	}
261		73
262	/*	74	// enqueue a single mapspace, but only if it hasn't
263	* expand_sight goes through the array of what the given player is	75	// been enqueued yet.
264	* able to see, and expands the visible area a bit, so the player will,
265	* to a certain degree, be able to see into corners.
266	* This is somewhat suboptimal, would be better to improve the formula.
267	*/
268
269	static void	76	static void
270	expand_sight (object *op)	77	enqueue (sint8 dx, sint8 dy, uint8 flags = 0)
271	{	78	{
272	int i, x, y, dx, dy;	79	sint8 x = LOS_X0 + dx;
		80	sint8 y = LOS_Y0 + dy;
273		81
274	for (x = 1; x < op->contr->ns->mapx - 1; x++) /* loop over inner squares */	82	los_info &l = los[x][y];
275	for (y = 1; y < op->contr->ns->mapy - 1; y++)	83
		84	l.flags \|= flags;
		85
		86	if (l.flags & FLG_QUEUED)
		87	return;
		88
		89	l.flags \|= FLG_QUEUED;
		90
		91	queue[q1].x = dx;
		92	queue[q1].y = dy;
		93
		94	q1 = (q1 + 1) & (QUEUE_LENGTH - 1);
		95	}
		96
		97	// run the los algorithm
		98	// this is a variant of a spiral los algorithm taken from
		99	// http://www.geocities.com/temerra/los_rays.html
		100	// which has been simplified and changed considerably, but
		101	// still is basically the same algorithm.
		102	static void
		103	calculate_los (player *pl)
		104	{
		105	{
		106	memset (los, 0, sizeof (los));
		107
		108	// we keep one line for ourselves, for the border flag
		109	// so the client area is actually MAP_CLIENT_(X\|Y) - 2
		110	int half_x = min (LOS_X0 - 1, pl->ns->mapx / 2);
		111	int half_y = min (LOS_Y0 - 1, pl->ns->mapy / 2);
		112
		113	// create borders, the corners are not touched
		114	for (int dx = -half_x; dx <= half_x; ++dx)
		115	los [dx + LOS_X0][LOS_Y0 - (half_y + 1)].flags =
		116	los [dx + LOS_X0][LOS_Y0 + (half_y + 1)].flags = FLG_QUEUED;
		117
		118	for (int dy = -half_y; dy <= half_y; ++dy)
		119	los [LOS_X0 - (half_x + 1)][dy + LOS_Y0].flags =
		120	los [LOS_X0 + (half_x + 1)][dy + LOS_Y0].flags = FLG_QUEUED;
		121
		122	// now reset the los area and also add blocked flags
		123	// which supposedly is faster than doing it inside the
		124	// spiral path algorithm below, except when very little
		125	// area is visible, in which case it is slower. which evens
		126	// out los calculation times between large and small los maps.
		127	// apply_lights also iterates over this area, maybe these
		128	// two passes could be combined somehow.
		129	unordered_mapwalk (pl->viewpoint, -half_x, -half_y, half_x, half_y)
276	{	130	{
277	if (!op->contr->blocked_los[x][y] &&	131	los_info &l = los [LOS_X0 + dx][LOS_Y0 + dy];
278	!(get_map_flags (op->map, NULL,	132	l.flags = m->at (nx, ny).flags () & P_BLOCKSVIEW ? FLG_BLOCKED : 0;
279	op->x - op->contr->ns->mapx / 2 + x,
280	op->y - op->contr->ns->mapy / 2 + y, NULL, NULL) & (P_BLOCKSVIEW \| P_OUT_OF_MAP)))
281	{
282
283	for (i = 1; i <= 8; i += 1)
284	{ /* mark all directions */
285	dx = x + freearr_x[i];
286	dy = y + freearr_y[i];
287	if (op->contr->blocked_los[dx][dy] > 0) /* for any square blocked */
288	op->contr->blocked_los[dx][dy] = -1;
289	}
290	}
291	}	133	}
		134	}
292		135
293	if (op->map->darkness > 0) /* player is on a dark map */	136	q1 = 0; q2 = 0; // initialise queue, not strictly required
294	expand_lighted_sight (op);	137	enqueue (0, 0); // enqueue center
295		138
296	/* clear mark squares */	139	// treat the origin specially
297	for (x = 0; x < op->contr->ns->mapx; x++)	140	los[LOS_X0][LOS_Y0].visible = 1;
298	for (y = 0; y < op->contr->ns->mapy; y++)	141	pl->los[LOS_X0][LOS_Y0] = 0;
299	if (op->contr->blocked_los[x][y] < 0)
300	op->contr->blocked_los[x][y] = 0;
301	}
302		142
303	/* returns true if op carries one or more lights	143	// loop over all enqueued points until the queue is empty
304	* This is a trivial function now days, but it used to	144	// the order in which this is done ensures that we
305	* be a bit longer. Probably better for callers to just	145	// never touch a mapspace whose input spaces we haven't checked
306	* check the op->glow_radius instead of calling this.	146	// yet.
307	*/	147	while (q1 != q2)
		148	{
		149	sint8 dx = queue[q2].x;
		150	sint8 dy = queue[q2].y;
308		151
309	int	152	q2 = (q2 + 1) & (QUEUE_LENGTH - 1);
310	has_carried_lights (const object *op)
311	{
312	/* op may glow! */
313	if (op->glow_radius > 0)
314	return 1;
315		153
316	return 0;	154	sint8 x = LOS_X0 + dx;
		155	sint8 y = LOS_Y0 + dy;
		156
		157	los_info &l = los[x][y];
		158
		159	if (expect_true (l.flags & (FLG_XI \| FLG_YI)))
		160	{
		161	l.culled = 1;
		162	l.xo = l.yo = l.xe = l.ye = 0;
		163
		164	// check contributing spaces, first horizontal
		165	if (expect_true (l.flags & FLG_XI))
		166	{
		167	los_info *xi = &los[x - sign (dx)][y];
		168
		169	// don't cull unless obscured
		170	l.culled &= !xi->visible;
		171
		172	/* merge input space */
		173	if (expect_false (xi->xo \|\| xi->yo))
		174	{
		175	// The X input can provide two main pieces of information:
		176	// 1. Progressive X obscurity.
		177	// 2. Recessive Y obscurity.
		178
		179	// Progressive X obscurity, favouring recessive input angle
		180	if (xi->xe > 0 && l.xo == 0)
		181	{
		182	l.xe = xi->xe - xi->yo;
		183	l.ye = xi->ye + xi->yo;
		184	l.xo = xi->xo;
		185	l.yo = xi->yo;
		186	}
		187
		188	// Recessive Y obscurity
		189	if (xi->ye <= 0 && xi->yo > 0 && xi->xe > 0)
		190	{
		191	l.ye = xi->yo + xi->ye;
		192	l.xe = xi->xe - xi->yo;
		193	l.xo = xi->xo;
		194	l.yo = xi->yo;
		195	}
		196	}
		197	}
		198
		199	// check contributing spaces, last vertical, identical structure
		200	if (expect_true (l.flags & FLG_YI))
		201	{
		202	los_info *yi = &los[x][y - sign (dy)];
		203
		204	// don't cull unless obscured
		205	l.culled &= !yi->visible;
		206
		207	/* merge input space */
		208	if (expect_false (yi->yo \|\| yi->xo))
		209	{
		210	// The Y input can provide two main pieces of information:
		211	// 1. Progressive Y obscurity.
		212	// 2. Recessive X obscurity.
		213
		214	// Progressive Y obscurity, favouring recessive input angle
		215	if (yi->ye > 0 && l.yo == 0)
		216	{
		217	l.ye = yi->ye - yi->xo;
		218	l.xe = yi->xe + yi->xo;
		219	l.yo = yi->yo;
		220	l.xo = yi->xo;
		221	}
		222
		223	// Recessive X obscurity
		224	if (yi->xe <= 0 && yi->xo > 0 && yi->ye > 0)
		225	{
		226	l.xe = yi->xo + yi->xe;
		227	l.ye = yi->ye - yi->xo;
		228	l.yo = yi->yo;
		229	l.xo = yi->xo;
		230	}
		231	}
		232	}
		233
		234	if (l.flags & FLG_BLOCKED)
		235	{
		236	l.xo = l.xe = abs (dx);
		237	l.yo = l.ye = abs (dy);
		238
		239	// we obscure dependents, but might be visible
		240	// copy the los from the square towards the player,
		241	// so outward diagonal corners are lit.
		242	pl->los[x][y] = los[x - sign0 (dx)][y - sign0 (dy)].visible ? 0 : LOS_BLOCKED;
		243
		244	l.visible = false;
		245	}
		246	else
		247	{
		248	// we are not blocked, so calculate visibility, by checking
		249	// whether we are inside or outside the shadow
		250	l.visible = (l.xe <= 0 \|\| l.xe > l.xo)
		251	&& (l.ye <= 0 \|\| l.ye > l.yo);
		252
		253	pl->los[x][y] = l.culled ? LOS_BLOCKED
		254	: l.visible ? 0
		255	: 3;
		256	}
		257
		258	}
		259
		260	// Expands by the unit length in each component's current direction.
		261	// If a component has no direction, then it is expanded in both of its
		262	// positive and negative directions.
		263	if (!l.culled)
		264	{
		265	if (dx >= 0) enqueue (dx + 1, dy, FLG_XI);
		266	if (dx <= 0) enqueue (dx - 1, dy, FLG_XI);
		267	if (dy >= 0) enqueue (dx, dy + 1, FLG_YI);
		268	if (dy <= 0) enqueue (dx, dy - 1, FLG_YI);
		269	}
		270	}
317	}	271	}
318		272
319	/* radius, distance => lightness adjust */	273	/* radius, distance => lightness adjust */
320	static sint8 darkness[MAX_LIGHT_RADIUS * 2 + 1][MAX_LIGHT_RADIUS + 1];	274	static sint8 light_atten[MAX_LIGHT_RADIUS * 2 + 1][MAX_LIGHT_RADIUS * 3 / 2 + 1];
		275	static sint8 vision_atten[MAX_VISION + 1][MAX_VISION * 3 / 2 + 1];
321		276
322	static struct darkness_init	277	static struct los_init
323	{	278	{
324	darkness_init ()	279	los_init ()
325	{	280	{
		281	assert (("QUEUE_LENGTH, MAP_CLIENT_X and MAP_CLIENT_Y must be powers of two",
		282	!(QUEUE_LENGTH & (QUEUE_LENGTH - 1))));
		283
		284	/* for lights */
326	for (int radius = -MAX_LIGHT_RADIUS; radius <= MAX_LIGHT_RADIUS; ++radius)	285	for (int radius = -MAX_LIGHT_RADIUS; radius <= MAX_LIGHT_RADIUS; ++radius)
327	for (int distance = 0; distance <= MAX_LIGHT_RADIUS; ++distance)	286	for (int distance = 0; distance <= MAX_LIGHT_RADIUS * 3 / 2; ++distance)
328	{	287	{
329	// max intensity	288	// max intensity
330	int intensity = min (MAX_DARKNESS_LOS, abs (radius) + 1);	289	int intensity = min (LOS_MAX, abs (radius) + 1);
331		290
332	// actual intensity	291	// actual intensity
333	intensity = max (0, lerp_rd (distance, 0, abs (radius) + 1, intensity, 0));	292	intensity = max (0, lerp_ru (distance, 0, abs (radius) + 1, intensity, 0));
334		293
335	darkness [radius + MAX_LIGHT_RADIUS][distance] = radius < 0	294	light_atten [radius + MAX_LIGHT_RADIUS][distance] = radius < 0
336	? intensity	295	? min (3, intensity)
337	: MAX_DARKNESS_LOS - intensity;	296	: LOS_MAX - intensity;
338	}	297	}
		298
		299	/* for general vision */
		300	for (int radius = 0; radius <= MAX_VISION; ++radius)
		301	for (int distance = 0; distance <= MAX_VISION * 3 / 2; ++distance)
		302	vision_atten [radius][distance] = distance <= radius ? clamp (lerp (radius, 0, MAX_DARKNESS, 3, 0), 0, 3) : 4;
339	}	303	}
340	} darkness_init;	304	} los_init;
341		305
		306	// brighten area, ignore los
		307	sint8
		308	los_brighten_nolos (sint8 b, sint8 l)
		309	{
		310	return min (b, l);
		311	}
		312
		313	// brighten area, but respect los
		314	sint8
		315	los_brighten (sint8 b, sint8 l)
		316	{
		317	return b == LOS_BLOCKED ? b : min (b, l);
		318	}
		319
		320	// darken area, respect los
		321	sint8
		322	los_darken (sint8 b, sint8 l)
		323	{
		324	return max (b, l);
		325	}
		326
		327	template<sint8 change_it (sint8, sint8)>
342	static void	328	static void
343	expand_lighted_sight (object *op)	329	apply_light (player pl, int dx, int dy, int light, const sint8 atten_table)
344	{	330	{
345	int x, y, darklevel, basex, basey, mflags, light, x1, y1;	331	// min or max the circular area around basex, basey
346	maptile *m = op->map;	332	dx += LOS_X0;
347	sint16 nx, ny;	333	dy += LOS_Y0;
348		334
349	darklevel = m->darkness;	335	int hx = pl->ns->mapx / 2;
		336	int hy = pl->ns->mapy / 2;
350		337
351	/* If the player can see in the dark, lower the darklevel for him */	338	int ax0 = max (LOS_X0 - hx, dx - light);
352	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))	339	int ay0 = max (LOS_Y0 - hy, dy - light);
353	darklevel -= MAX_DARKNESS_LOS / 2;	340	int ax1 = min (dx + light, LOS_X0 + hx);
		341	int ay1 = min (dy + light, LOS_Y0 + hy);
354		342
		343	for (int ax = ax0; ax <= ax1; ax++)
		344	for (int ay = ay0; ay <= ay1; ay++)
		345	pl->los[ax][ay] =
		346	change_it (pl->los[ax][ay], atten_table [idistance (ax - dx, ay - dy)]);
		347	}
		348
355	/* add light, by finding all (non-null) nearby light sources, then	349	/* add light, by finding all (non-null) nearby light sources, then
356	* mark those squares specially. If the darklevel<1, there is no	350	* mark those squares specially.
357	* reason to do this, so we skip this function
358	*/	351	*/
		352	static void
		353	apply_lights (player *pl)
		354	{
		355	object *op = pl->viewpoint;
		356	int darklevel = op->map->darklevel ();
359		357
		358	int half_x = pl->ns->mapx / 2;
		359	int half_y = pl->ns->mapy / 2;
		360
		361	int pass2 = 0; // negative lights have an extra pass
		362
		363	maprect *rects = pl->viewpoint->map->split_to_tiles (
		364	pl->viewpoint->x - half_x - MAX_LIGHT_RADIUS,
		365	pl->viewpoint->y - half_y - MAX_LIGHT_RADIUS,
		366	pl->viewpoint->x + half_x + MAX_LIGHT_RADIUS + 1,
		367	pl->viewpoint->y + half_y + MAX_LIGHT_RADIUS + 1
		368	);
		369
		370	/* If the player can see in the dark, increase light/vision radius */
		371	int bonus = op->flag [FLAG_SEE_IN_DARK] ? SEE_IN_DARK_RADIUS : 0;
		372
360	if (darklevel < 1)	373	if (!darklevel)
361	return;	374	pass2 = 1;
362		375	else
363	/* Do a sanity check. If not valid, some code below may do odd
364	* things.
365	*/
366	if (darklevel > MAX_DARKNESS)
367	{	376	{
368	LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);	377	/* first, make everything totally dark */
369	darklevel = MAX_DARKNESS;	378	for (int dx = -half_x; dx <= half_x; dx++)
		379	for (int dy = -half_x; dy <= half_y; dy++)
		380	max_it (pl->los[dx + LOS_X0][dy + LOS_Y0], LOS_MAX);
		381
		382	/*
		383	* Only process the area of interest.
		384	* the basex, basey values represent the position in the op->contr->los
		385	* array. Its easier to just increment them here (and start with the right
		386	* value) than to recalculate them down below.
		387	*/
		388	for (maprect *r = rects; r->m; ++r)
		389	rect_mapwalk (r, 0, 0)
		390	{
		391	mapspace &ms = m->at (nx, ny);
		392	ms.update ();
		393	sint8 light = ms.light;
		394
		395	if (expect_false (light))
		396	if (light < 0)
		397	pass2 = 1;
		398	else
		399	{
		400	light = clamp (light + bonus, 0, MAX_LIGHT_RADIUS);
		401	apply_light<los_brighten> (pl, dx - pl->viewpoint->x, dy - pl->viewpoint->y, light, light_atten [light + MAX_LIGHT_RADIUS]);
		402	}
		403	}
		404
		405	/* grant some vision to the player, based on outside, outdoor, and darklevel */
		406	{
		407	int light;
		408
		409	if (!op->map->outdoor) // not outdoor, darkness becomes light radius
		410	light = MAX_DARKNESS - op->map->darkness;
		411	else if (op->map->darkness > 0) // outdoor and darkness > 0 => use darkness as max radius
		412	light = lerp_rd (maptile::outdoor_darkness + 0, 0, MAX_DARKNESS, MAX_DARKNESS - op->map->darkness, 0);
		413	else // outdoor and darkness <= 0 => start wide and decrease quickly
		414	light = lerp (maptile::outdoor_darkness + op->map->darkness, 0, MAX_DARKNESS, MAX_VISION, 2);
		415
		416	light = clamp (light + bonus, 0, MAX_VISION);
		417
		418	apply_light<los_brighten> (pl, 0, 0, light, vision_atten [light]);
		419	}
370	}	420	}
371		421
372	/* first, make everything totally dark */	422	// when we fly high, we have some minimum viewable area around us, like x-ray
373	for (x = 0; x < op->contr->ns->mapx; x++)	423	if (op->move_type & MOVE_FLY_HIGH)
374	for (y = 0; y < op->contr->ns->mapy; y++)	424	apply_light<los_brighten_nolos> (pl, 0, 0, 9, vision_atten [9]);
375	if (op->contr->blocked_los[x][y] != 100)
376	op->contr->blocked_los[x][y] = MAX_DARKNESS_LOS;
377		425
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	/*
389	* Only process the area of interest.
390	* the basex, basey values represent the position in the op->contr->blocked_los
391	* array. Its easier to just increment them here (and start with the right
392	* value) than to recalculate them down below.
393	*/
394	for (int x = min_x, basex = -MAX_LIGHT_RADIUS; x <= max_x; 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;
400
401	if (!xy_normalise (m, nx, ny))
402	continue;
403
404	mapspace &ms = m->at (nx, ny);
405	ms.update ();
406	sint8 light = ms.light;
407
408	if (expect_false (light))
409	if (light < 0)
410	pass2 = 1;
411	else
412	{
413	/* This space is providing light, so we need to brighten up the
414	* spaces around here.
415	*/
416	const sint8 *darkness_table = darkness [light + MAX_LIGHT_RADIUS];
417
418	for (int ax = max (0, basex - light); ax <= min (basex + light, op->contr->ns->mapx - 1); ax++)
419	for (int ay = max (0, basey - light); ay <= min (basey + light, op->contr->ns->mapy - 1); ay++)
420	if (op->contr->blocked_los[ax][ay] != 100)
421	min_it (op->contr->blocked_los[ax][ay], darkness_table [idistance (ax - basex, ay - basey)]);
422	}
423	}
424
425	// psosibly do 2nd pass for rare negative glow radii	426	// possibly do 2nd pass for rare negative glow radii
426	if (expect_false (pass2))	427	// for effect, those are always considered to be stronger than anything else
427	for (x = min_x, basex = -MAX_LIGHT_RADIUS; x <= max_x; x++, basex++)	428	// but they can't darken a place completely
428	for (y = min_y, basey = -MAX_LIGHT_RADIUS; y <= max_y; y++, basey++)	429	if (pass2)
		430	for (maprect *r = rects; r->m; ++r)
		431	rect_mapwalk (r, 0, 0)
429	{	432	{
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);	433	mapspace &ms = m->at (nx, ny);
438	ms.update ();	434	ms.update ();
439	sint8 light = ms.light;	435	sint8 light = ms.light;
440		436
441	if (expect_false (light < 0))	437	if (expect_false (light < 0))
442	{	438	{
443	const sint8 *darkness_table = darkness [light + MAX_LIGHT_RADIUS];	439	light = clamp (light - bonus, 0, MAX_DARKNESS);
444		440	apply_light<los_darken> (pl, dx - pl->viewpoint->x, dy - pl->viewpoint->y, -light, light_atten [light + MAX_LIGHT_RADIUS]);
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	}	441	}
450	}	442	}
451
452	/* Outdoor should never really be completely pitch black dark like
453	* a dungeon, so let the player at least see a little around themselves
454	*/
455	if (op->map->outdoor && darklevel > MAX_DARKNESS - 3)
456	{
457	if (op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] > (MAX_DARKNESS - 3))
458	op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = MAX_DARKNESS - 3;
459
460	for (x = -1; x <= 1; x++)
461	for (y = -1; y <= 1; y++)
462	{
463	if (op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->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	}
466	}
467
468	/* grant some vision to the player, based on the darklevel */
469	for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)
470	for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++)
471	if (!(op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] == 100))
472	op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] -=
473	max (0, 6 - darklevel - max (abs (x), abs (y)));
474	}	443	}
475		444
476	/* blinded_sight() - sets all viewable squares to blocked except	445	/* blinded_sight() - sets all viewable squares to blocked except
477	* for the one the central one that the player occupies. A little	446	* for the one the central one that the player occupies. A little
478	* odd that you can see yourself (and what your standing on), but	447	* odd that you can see yourself (and what your standing on), but
479	* really need for any reasonable game play.	448	* really need for any reasonable game play.
480	*/	449	*/
481	static void	450	static void
482	blinded_sight (object *op)	451	blinded_sight (player *pl)
483	{	452	{
484	int x, y;	453	pl->los[LOS_X0][LOS_Y0] = 1;
485
486	for (x = 0; x < op->contr->ns->mapx; x++)
487	for (y = 0; y < op->contr->ns->mapy; y++)
488	op->contr->blocked_los[x][y] = 100;
489
490	op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = 0;
491	}	454	}
492		455
493	/*	456	/*
494	* update_los() recalculates the array which specifies what is	457	* update_los() recalculates the array which specifies what is
495	* visible for the given player-object.	458	* visible for the given player-object.
496	*/	459	*/
497	void	460	void
498	update_los (object *op)	461	player::update_los ()
499	{	462	{
500	int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y;	463	if (ob->flag [FLAG_REMOVED])//D really needed?
501
502	if (QUERY_FLAG (op, FLAG_REMOVED))
503	return;	464	return;
504		465
505	clear_los (op->contr);	466	if (ob->flag [FLAG_WIZLOOK])
506		467	clear_los (0);
507	if (QUERY_FLAG (op, FLAG_WIZ) /* \|\|XRAYS(op) */ )	468	else if (viewpoint->flag [FLAG_BLIND]) /* player is blind */
508	return;	469	{
509		470	clear_los ();
510	/* For larger maps, this is more efficient than the old way which
511	* used the chaining of the block array. Since many space views could
512	* be blocked by different spaces in front, this mean that a lot of spaces
513	* could be examined multile times, as each path would be looked at.
514	*/
515	for (x = (MAP_CLIENT_X - op->contr->ns->mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->ns->mapx) / 2 + 1; x++)
516	for (y = (MAP_CLIENT_Y - op->contr->ns->mapy) / 2 - 1; y < (MAP_CLIENT_Y + op->contr->ns->mapy) / 2 + 1; y++)
517	check_wall (op, x, y);
518
519	/* do the los of the player. 3 (potential) cases */
520	if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */
521	blinded_sight (op);	471	blinded_sight (this);
		472	}
522	else	473	else
523	expand_sight (op);	474	{
		475	clear_los ();
		476	calculate_los (this);
		477	apply_lights (this);
		478	}
524		479
525	//TODO: no range-checking whatsoever :(	480	if (viewpoint->flag [FLAG_XRAYS])
526	if (QUERY_FLAG (op, FLAG_XRAYS))
527	for (int x = -2; x <= 2; x++)	481	for (int dx = -2; dx <= 2; dx++)
528	for (int y = -2; y <= 2; y++)	482	for (int dy = -2; dy <= 2; dy++)
529	op->contr->blocked_los[dx + x][dy + y] = 0;	483	min_it (los[dx + LOS_X0][dy + LOS_Y0], 1);
530	}	484	}
531		485
532	/* update all_map_los is like update_all_los below,	486	/* update all_map_los is like update_all_los below,
533	* but updates everyone on the map, no matter where they	487	* but updates everyone on the map, no matter where they
534	* are. This generally should not be used, as a per	488	* are. This generally should not be used, as a per
541	* change_map_light function	495	* change_map_light function
542	*/	496	*/
543	void	497	void
544	update_all_map_los (maptile *map)	498	update_all_map_los (maptile *map)
545	{	499	{
546	for_all_players (pl)	500	for_all_players_on_map (pl, map)
547	if (pl->ob && pl->ob->map == map)
548	pl->do_los = 1;	501	pl->do_los = 1;
549	}	502	}
550		503
551	/*	504	/*
552	* This function makes sure that update_los() will be called for all	505	* This function makes sure that update_los() will be called for all
553	* players on the given map within the next frame.	506	* players on the given map within the next frame.
…		…
561	* map is the map that changed, x and y are the coordinates.	514	* map is the map that changed, x and y are the coordinates.
562	*/	515	*/
563	void	516	void
564	update_all_los (const maptile *map, int x, int y)	517	update_all_los (const maptile *map, int x, int y)
565	{	518	{
		519	map->at (x, y).invalidate ();
		520
566	for_all_players (pl)	521	for_all_players (pl)
567	{	522	{
568	/* Player should not have a null map, but do this	523	/* Player should not have a null map, but do this
569	* check as a safety	524	* check as a safety
570	*/	525	*/
571	if (!pl->ob \|\| !pl->ob->map \|\| !pl->ns)	526	if (!pl->ob \|\| !pl->ob->map \|\| !pl->ns)
572	continue;	527	continue;
573		528
574	/* Same map is simple case - see if pl is close enough.	529	rv_vector rv;
575	* Note in all cases, we did the check for same map first,	530
576	* and then see if the player is close enough and update	531	get_rangevector_from_mapcoord (map, x, y, pl->ob, &rv);
577	* los if that is the case. If the player is on the
578	* corresponding map, but not close enough, then the
579	* player can't be on another map that may be closer,
580	* so by setting it up this way, we trim processing
581	* some.
582	*/	532
583	if (pl->ob->map == map)	533	if ((abs (rv.distance_x) <= pl->ns->mapx / 2) && (abs (rv.distance_y) <= pl->ns->mapy / 2))
584	{
585	if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
586	pl->do_los = 1;	534	pl->do_los = 1;
587	}
588
589	/* Now we check to see if player is on adjacent
590	* maps to the one that changed and also within
591	* view. The tile_maps[] could be null, but in that
592	* case it should never match the pl->ob->map, so
593	* we want ever try to dereference any of the data in it.
594	*
595	* The logic for 0 and 3 is to see how far the player is
596	* from the edge of the map (height/width) - pl->ob->(x,y)
597	* and to add current position on this map - that gives a
598	* distance.
599	* For 1 and 2, we check to see how far the given
600	* coordinate (x,y) is from the corresponding edge,
601	* and then add the players location, which gives
602	* a distance.
603	*/
604	else if (pl->ob->map == map->tile_map[0])
605	{
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))
607	pl->do_los = 1;
608	}
609	else if (pl->ob->map == map->tile_map[2])
610	{
611	if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y + map->height - y) <= pl->ns->mapy / 2))
612	pl->do_los = 1;
613	}
614	else if (pl->ob->map == map->tile_map[1])
615	{
616	if ((abs (pl->ob->x + map->width - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
617	pl->do_los = 1;
618	}
619	else if (pl->ob->map == map->tile_map[3])
620	{
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))
622	pl->do_los = 1;
623	}
624	}	535	}
625	}	536	}
626		537
		538	static const int season_darkness[5][HOURS_PER_DAY] = {
		539	/0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 1 2 3 4 5 6 7 8 9 10 11 12 13 /
		540	{ 5, 5, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 1, 2, 2, 2, 3, 3, 4, 4, 5 },
		541	{ 5, 5, 4, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4 },
		542	{ 5, 4, 4, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 4, 4 },
		543	{ 4, 4, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 4 },
		544	{ 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4 }
		545	};
		546
627	/*	547	/*
628	* Debug-routine which dumps the array which specifies the visible	548	* Tell players the time and compute the darkness level for all maps in the game.
629	* area of a player. Triggered by the z key in DM mode.	549	* MUST be called exactly once per hour.
630	*/	550	*/
631	void	551	void
632	print_los (object *op)	552	maptile::adjust_daylight ()
633	{	553	{
634	int x, y;	554	timeofday_t tod;
635	char buf[50], buf2[10];
636		555
637	strcpy (buf, " ");	556	get_tod (&tod);
638		557
639	for (x = 0; x < op->contr->ns->mapx; x++)	558	// log the time to log-1 every hour, and to chat every day
640	{	559	{
641	sprintf (buf2, "%2d", x);	560	char todbuf[512];
642	strcat (buf, buf2);	561
		562	format_tod (todbuf, sizeof (todbuf), &tod);
		563
		564	for_all_players (pl)
		565	pl->ns->send_msg (NDI_GREY, tod.hour == 15 ? CHAT_CHANNEL : LOG_CHANNEL, todbuf);
643	}	566	}
644		567
645	new_draw_info (NDI_UNIQUE, 0, op, buf);	568	/* If the light level isn't changing, no reason to do all
		569	* the work below.
		570	*/
		571	sint8 new_darkness = season_darkness[tod.season][tod.hour];
646		572
647	for (y = 0; y < op->contr->ns->mapy; y++)	573	if (new_darkness == maptile::outdoor_darkness)
648	{	574	return;
649	sprintf (buf, "%2d:", y);
650		575
651	for (x = 0; x < op->contr->ns->mapx; x++)	576	new_draw_info (NDI_GREY \| NDI_UNIQUE \| NDI_ALL, 1, 0,
652	{	577	new_darkness > maptile::outdoor_darkness
653	sprintf (buf2, " %1d", op->contr->blocked_los[x][y]);	578	? "It becomes darker."
654	strcat (buf, buf2);	579	: "It becomes brighter.");
655	}
656		580
657	new_draw_info (NDI_UNIQUE, 0, op, buf);	581	maptile::outdoor_darkness = new_darkness;
658	}	582
		583	// we simply update the los for all players, which is unnecessarily
		584	// costly, but should do for the moment.
		585	for_all_players (pl)
		586	pl->do_los = 1;
659	}	587	}
660		588
661	/*	589	/*
662	* make_sure_seen: The object is supposed to be visible through walls, thus	590	* make_sure_seen: The object is supposed to be visible through walls, thus
663	* check if any players are nearby, and edit their LOS array.	591	* check if any players are nearby, and edit their LOS array.
664	*/	592	*/
665
666	void	593	void
667	make_sure_seen (const object *op)	594	make_sure_seen (const object *op)
668	{	595	{
669	for_all_players (pl)	596	for_all_players (pl)
670	if (pl->ob->map == op->map &&	597	if (pl->ob->map == op->map &&
671	pl->ob->y - pl->ns->mapy / 2 <= op->y &&	598	pl->ob->y - pl->ns->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)	599	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)
673	pl->blocked_los[pl->ns->mapx / 2 + op->x - pl->ob->x][pl->ns->mapy / 2 + op->y - pl->ob->y] = 0;	600	pl->los[op->x - pl->ob->x + LOS_X0][op->y - pl->ob->y + LOS_Y0] = 0;
674	}	601	}
675		602
676	/*	603	/*
677	* make_sure_not_seen: The object which is supposed to be visible through	604	* make_sure_not_seen: The object which is supposed to be visible through
678	* walls has just been removed from the map, so update the los of any	605	* walls has just been removed from the map, so update the los of any
679	* players within its range	606	* players within its range
680	*/	607	*/
681
682	void	608	void
683	make_sure_not_seen (const object *op)	609	make_sure_not_seen (const object *op)
684	{	610	{
685	for_all_players (pl)	611	for_all_players (pl)
686	if (pl->ob->map == op->map &&	612	if (pl->ob->map == op->map &&
687	pl->ob->y - pl->ns->mapy / 2 <= op->y &&	613	pl->ob->y - pl->ns->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)	614	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)
689	pl->do_los = 1;	615	pl->do_los = 1;
690	}	616	}
		617

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.34 by root, Thu Dec 4 03:52:00 2008 UTC vs. Revision 1.65 by root, Wed Nov 4 18:17:57 2009 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.34 by root, Thu Dec 4 03:52:00 2008 UTC vs.
Revision 1.65 by root, Wed Nov 4 18:17:57 2009 UTC