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

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

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.40 by root, Fri Dec 19 17:52:50 2008 UTC vs. Revision 1.67 by root, Sun Nov 29 17:41:07 2009 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.40 by root, Fri Dec 19 17:52:50 2008 UTC vs.
Revision 1.67 by root, Sun Nov 29 17:41:07 2009 UTC