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

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

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.37 by root, Thu Dec 18 02:49:22 2008 UTC vs. Revision 1.62 by root, Mon Oct 12 14:00:57 2009 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.37 by root, Thu Dec 18 02:49:22 2008 UTC vs.
Revision 1.62 by root, Mon Oct 12 14:00:57 2009 UTC