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

Comparing deliantra/server/common/los.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.77 by root, Sat Nov 17 23:40:00 2018 UTC

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

Diff Legend

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

Comparing deliantra/server/common/los.C (file contents): Revision 1.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs. Revision 1.77 by root, Sat Nov 17 23:40:00 2018 UTC

Diff Legend

Comparing deliantra/server/common/los.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.77 by root, Sat Nov 17 23:40:00 2018 UTC