ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/los.C
Revision: 1.31
Committed: Thu Dec 4 01:07:35 2008 UTC (15 years, 5 months ago) by root
Content type: text/plain
Branch: MAIN
Changes since 1.30: +17 -15 lines
Log Message:
enotunderstood

File Contents

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