ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/los.C
(Generate patch)

Comparing deliantra/server/common/los.C (file contents):
Revision 1.17 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.32 by root, Thu Dec 4 03:48:19 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 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 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22 */
24 23
25/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */ 24/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */
26 25
27#include <global.h> 26#include <global.h>
28#include <funcpoint.h>
29#include <math.h> 27#include <math.h>
30 28
31/* Distance must be less than this for the object to be blocked. 29/* Distance must be less than this for the object to be blocked.
32 * An object is 1.0 wide, so if set to 0.5, it means the object 30 * An object is 1.0 wide, so if set to 0.5, it means the object
33 * that blocks half the view (0.0 is complete block) will 31 * that blocks half the view (0.0 is complete block) will
34 * block view in our tables. 32 * block view in our tables.
35 * .4 or less lets you see through walls. .5 is about right. 33 * .4 or less lets you see through walls. .5 is about right.
36 */ 34 */
37 35
38#define SPACE_BLOCK 0.5 36#define SPACE_BLOCK 0.5
37#define MAX_DARKNESS_LOS 4 /* 4 == totally dark */
39 38
40typedef struct blstr 39typedef struct blstr
41{ 40{
42 int x[4], y[4]; 41 int x[4], y[4];
43 int index; 42 int index;
44} blocks; 43} blocks;
45 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.
46blocks block[MAP_CLIENT_X][MAP_CLIENT_Y]; 49blocks block[MAP_CLIENT_X][MAP_CLIENT_Y == 31 ? 32 : MAP_CLIENT_Y];
47 50
48static void expand_lighted_sight (object *op); 51static void expand_lighted_sight (object *op);
49 52
50/* 53/*
51 * Used to initialise the array used by the LOS routines. 54 * Used to initialise the array used by the LOS routines.
… …
90 93
91void 94void
92init_block (void) 95init_block (void)
93{ 96{
94 int x, y, dx, dy, i; 97 int x, y, dx, dy, i;
95 static int block_x[3] = { -1, -1, 0 }, block_y[3] = 98 static int block_x[3] = { -1, -1, 0 },
96 { 99 block_y[3] = { -1, 0, -1 };
97 -1, 0, -1};
98 100
99 for (x = 0; x < MAP_CLIENT_X; x++) 101 for (x = 0; x < MAP_CLIENT_X; x++)
100 for (y = 0; y < MAP_CLIENT_Y; y++) 102 for (y = 0; y < MAP_CLIENT_Y; y++)
101 {
102 block[x][y].index = 0; 103 block[x][y].index = 0;
103 }
104 104
105 105
106 /* The table should be symmetric, so only do the upper left 106 /* The table should be symmetric, so only do the upper left
107 * quadrant - makes the processing easier. 107 * quadrant - makes the processing easier.
108 */ 108 */
… …
125 /* For simplicity, we mirror the coordinates to block the other 125 /* For simplicity, we mirror the coordinates to block the other
126 * quadrants. 126 * quadrants.
127 */ 127 */
128 set_block (x, y, dx, dy); 128 set_block (x, y, dx, dy);
129 if (x == MAP_CLIENT_X / 2) 129 if (x == MAP_CLIENT_X / 2)
130 {
131 set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1); 130 set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1);
132 }
133 else if (y == MAP_CLIENT_Y / 2) 131 else if (y == MAP_CLIENT_Y / 2)
134 {
135 set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy); 132 set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);
136 }
137 } 133 }
138 else 134 else
139 { 135 {
140 float d1, r, s, l; 136 float d1, r, s, l;
141 137
… …
175 * that if some particular space is blocked, it blocks 171 * that if some particular space is blocked, it blocks
176 * the view of the spaces 'behind' it, and those blocked 172 * the view of the spaces 'behind' it, and those blocked
177 * spaces behind it may block other spaces, etc. 173 * spaces behind it may block other spaces, etc.
178 * In this way, the chain of visibility is set. 174 * In this way, the chain of visibility is set.
179 */ 175 */
180
181static void 176static void
182set_wall (object *op, int x, int y) 177set_wall (object *op, int x, int y)
183{ 178{
184 int i; 179 int i;
185 180
… …
252 * Clears/initialises the los-array associated to the player 247 * Clears/initialises the los-array associated to the player
253 * controlling the object. 248 * controlling the object.
254 */ 249 */
255 250
256void 251void
257clear_los (object *op) 252clear_los (player *pl)
258{ 253{
259 /* This is safer than using the ns->mapx, mapy because 254 /* This is safer than using the ns->mapx, mapy because
260 * we index the blocked_los as a 2 way array, so clearing 255 * we index the blocked_los as a 2 way array, so clearing
261 * the first z spaces may not not cover the spaces we are 256 * the first z spaces may not not cover the spaces we are
262 * actually going to use 257 * actually going to use
263 */ 258 */
264 (void) memset ((void *) op->contr->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y); 259 memset (pl->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y);
265} 260}
266 261
267/* 262/*
268 * expand_sight goes through the array of what the given player is 263 * expand_sight goes through the array of what the given player is
269 * able to see, and expands the visible area a bit, so the player will, 264 * able to see, and expands the visible area a bit, so the player will,
… …
296 } 291 }
297 292
298 if (op->map->darkness > 0) /* player is on a dark map */ 293 if (op->map->darkness > 0) /* player is on a dark map */
299 expand_lighted_sight (op); 294 expand_lighted_sight (op);
300 295
301
302 /* clear mark squares */ 296 /* clear mark squares */
303 for (x = 0; x < op->contr->ns->mapx; x++) 297 for (x = 0; x < op->contr->ns->mapx; x++)
304 for (y = 0; y < op->contr->ns->mapy; y++) 298 for (y = 0; y < op->contr->ns->mapy; y++)
305 if (op->contr->blocked_los[x][y] < 0) 299 if (op->contr->blocked_los[x][y] < 0)
306 op->contr->blocked_los[x][y] = 0; 300 op->contr->blocked_los[x][y] = 0;
307} 301}
308 302
309
310
311
312/* returns true if op carries one or more lights 303/* returns true if op carries one or more lights
313 * This is a trivial function now days, but it used to 304 * This is a trivial function now days, but it used to
314 * be a bit longer. Probably better for callers to just 305 * be a bit longer. Probably better for callers to just
315 * check the op->glow_radius instead of calling this. 306 * check the op->glow_radius instead of calling this.
316 */ 307 */
… …
323 return 1; 314 return 1;
324 315
325 return 0; 316 return 0;
326} 317}
327 318
319/* radius, distance => lightness adjust */
320static sint8 darkness[MAX_LIGHT_RADIUS * 2 + 1][MAX_LIGHT_RADIUS + 1];
321
322static struct darkness_init
323{
324 darkness_init ()
325 {
326 for (int radius = -MAX_LIGHT_RADIUS; radius <= MAX_LIGHT_RADIUS; ++radius)
327 for (int distance = 0; distance <= MAX_LIGHT_RADIUS; ++distance)
328 {
329 // max intensity
330 int intensity = min (MAX_DARKNESS_LOS, abs (radius) + 1);
331
332 // actual intensity
333 intensity = max (0, lerp_rd (distance, 0, abs (radius) + 1, intensity, 0));
334
335 darkness [radius + MAX_LIGHT_RADIUS][distance] = radius < 0
336 ? intensity
337 : MAX_DARKNESS_LOS - intensity;
338 }
339 }
340} darkness_init;
341
328static void 342static void
329expand_lighted_sight (object *op) 343expand_lighted_sight (object *op)
330{ 344{
331 int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1; 345 int x, y, darklevel, basex, basey, mflags, light, x1, y1;
332 maptile *m = op->map; 346 maptile *m = op->map;
333 sint16 nx, ny; 347 sint16 nx, ny;
334 348
335 darklevel = m->darkness; 349 darklevel = m->darkness;
350 darklevel = MAX_DARKNESS;//D
336 351
337 /* If the player can see in the dark, lower the darklevel for him */ 352 /* If the player can see in the dark, lower the darklevel for him */
338 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) 353 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
339 darklevel -= 2; 354 darklevel -= MAX_DARKNESS_LOS / 2;
340 355
341 /* add light, by finding all (non-null) nearby light sources, then 356 /* add light, by finding all (non-null) nearby light sources, then
342 * mark those squares specially. If the darklevel<1, there is no 357 * mark those squares specially. If the darklevel<1, there is no
343 * reason to do this, so we skip this function 358 * reason to do this, so we skip this function
344 */ 359 */
… …
353 { 368 {
354 LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel); 369 LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);
355 darklevel = MAX_DARKNESS; 370 darklevel = MAX_DARKNESS;
356 } 371 }
357 372
358 /* First, limit player furthest (unlighted) vision */ 373 /* first, make everything totally dark */
359 for (x = 0; x < op->contr->ns->mapx; x++) 374 for (x = 0; x < op->contr->ns->mapx; x++)
360 for (y = 0; y < op->contr->ns->mapy; y++) 375 for (y = 0; y < op->contr->ns->mapy; y++)
361 if (op->contr->blocked_los[x][y] != 100) 376 if (op->contr->blocked_los[x][y] != 100)
362 op->contr->blocked_los[x][y] = MAX_LIGHT_RADII; 377 op->contr->blocked_los[x][y] = MAX_DARKNESS_LOS;
363 378
364 /* the spaces[] darkness value contains the information we need. 379 int half_x = op->contr->ns->mapx / 2;
380 int half_y = op->contr->ns->mapy / 2;
381
382 int min_x = op->x - half_x - MAX_LIGHT_RADIUS;
383 int min_y = op->y - half_y - MAX_LIGHT_RADIUS;
384 int max_x = op->x + half_x + MAX_LIGHT_RADIUS;
385 int max_y = op->y + half_y + MAX_LIGHT_RADIUS;
386
387 int pass2 = 0; // negative lights have an extra pass
388
389 /*
365 * Only process the area of interest. 390 * Only process the area of interest.
366 * 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->blocked_los
367 * 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
368 * value) than to recalculate them down below. 393 * value) than to recalculate them down below.
369 */ 394 */
370 for (x = (op->x - op->contr->ns->mapx / 2 - MAX_LIGHT_RADII), basex = -MAX_LIGHT_RADII; 395 for (int x = min_x, basex = -MAX_LIGHT_RADIUS; x <= max_x; x++, basex++)
371 x <= (op->x + op->contr->ns->mapx / 2 + MAX_LIGHT_RADII); x++, basex++) 396 for (int y = min_y, basey = -MAX_LIGHT_RADIUS; y <= max_y; y++, basey++)
372 {
373
374 for (y = (op->y - op->contr->ns->mapy / 2 - MAX_LIGHT_RADII), basey = -MAX_LIGHT_RADII;
375 y <= (op->y + op->contr->ns->mapy / 2 + MAX_LIGHT_RADII); y++, basey++)
376 { 397 {
398 maptile *m = op->map;
399 sint16 nx = x;
400 sint16 ny = y;
401
402 if (!xy_normalise (m, nx, ny))
403 continue;
404
405 mapspace &ms = m->at (nx, ny);
406 ms.update ();
407 sint8 light = ms.light;
408
409 if (expect_false (light))
410 if (light < 0)
411 pass2 = 1;
412 else
413 {
414 /* This space is providing light, so we need to brighten up the
415 * spaces around here.
416 */
417 const sint8 *darkness_table = darkness [light + MAX_LIGHT_RADIUS];
418
419 for (int ax = max (0, basex - light); ax <= min (basex + light, op->contr->ns->mapx - 1); ax++)
420 for (int ay = max (0, basey - light); ay <= min (basey + light, op->contr->ns->mapy - 1); ay++)
421 if (op->contr->blocked_los[ax][ay] != 100)
422 min_it (op->contr->blocked_los[ax][ay], darkness_table [idistance (ax - basex, ay - basey)]);
423 }
424 }
425
426 // psosibly do 2nd pass for rare negative glow radii
427 if (pass2)
428 for (x = min_x, basex = -MAX_LIGHT_RADIUS; x <= max_x; x++, basex++)
429 for (y = min_y, basey = -MAX_LIGHT_RADIUS; y <= max_y; y++, basey++)
430 {
377 m = op->map; 431 maptile *m = op->map;
378 nx = x; 432 sint16 nx = x;
379 ny = y; 433 sint16 ny = y;
380 434
381 mflags = get_map_flags (m, &m, nx, ny, &nx, &ny); 435 if (!xy_normalise (m, nx, ny))
382
383 if (mflags & P_OUT_OF_MAP)
384 continue; 436 continue;
385 437
386 /* This space is providing light, so we need to brighten up the 438 mapspace &ms = m->at (nx, ny);
387 * spaces around here. 439 ms.update ();
388 */ 440 sint8 light = ms.light;
389 light = GET_MAP_LIGHT (m, nx, ny); 441
390 if (light != 0) 442 if (expect_false (light < 0))
391 { 443 {
392#if 0 444 const sint8 *darkness_table = darkness [light + MAX_LIGHT_RADIUS];
393 LOG (llevDebug, "expand_lighted_sight: Found light at x=%d, y=%d, basex=%d, basey=%d\n", x, y, basex, basey);
394#endif
395 for (ax = basex - light; ax <= basex + light; ax++)
396 {
397 if (ax < 0 || ax >= op->contr->ns->mapx)
398 continue;
399 for (ay = basey - light; ay <= basey + light; ay++)
400 {
401 if (ay < 0 || ay >= op->contr->ns->mapy)
402 continue;
403 445
404 /* If the space is fully blocked, do nothing. Otherwise, we 446 for (int ax = max (0, basex + light); ax <= min (basex - light, op->contr->ns->mapx - 1); ax++)
405 * brighten the space. The further the light is away from the 447 for (int ay = max (0, basey + light); ay <= min (basey - light, op->contr->ns->mapy - 1); ay++)
406 * source (basex-x), the less effect it has. Though light used
407 * to dim in a square manner, it now dims in a circular manner
408 * using the the pythagorean theorem. glow_radius still
409 * represents the radius
410 */
411 if (op->contr->blocked_los[ax][ay] != 100) 448 if (op->contr->blocked_los[ax][ay] != 100)
412 { 449 max_it (op->contr->blocked_los[ax][ay], darkness_table [idistance (ax - basex, ay - basey)]);
413 x1 = abs (basex - ax) * abs (basex - ax); 450 }
414 y1 = abs (basey - ay) * abs (basey - ay); 451 }
415 if (light > 0)
416 op->contr->blocked_los[ax][ay] -= MAX ((light - isqrt (x1 + y1)), 0);
417 if (light < 0)
418 op->contr->blocked_los[ax][ay] -= MIN ((light + isqrt (x1 + y1)), 0);
419 }
420 } /* for ay */
421 } /* for ax */
422 } /* if this space is providing light */
423 } /* for y */
424 } /* for x */
425 452
426 /* Outdoor should never really be completely pitch black dark like 453 /* Outdoor should never really be completely pitch black dark like
427 * a dungeon, so let the player at least see a little around themselves 454 * a dungeon, so let the player at least see a little around themselves
428 */ 455 */
429 if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3)) 456 if (op->map->outdoor && darklevel > MAX_DARKNESS - 3)
430 { 457 {
431 if (op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] > (MAX_DARKNESS - 3)) 458 if (op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] > (MAX_DARKNESS - 3))
432 op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = MAX_DARKNESS - 3; 459 op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = MAX_DARKNESS - 3;
433 460
434 for (x = -1; x <= 1; x++) 461 for (x = -1; x <= 1; x++)
… …
436 { 463 {
437 if (op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] > (MAX_DARKNESS - 2)) 464 if (op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] > (MAX_DARKNESS - 2))
438 op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] = MAX_DARKNESS - 2; 465 op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] = MAX_DARKNESS - 2;
439 } 466 }
440 } 467 }
468
441 /* grant some vision to the player, based on the darklevel */ 469 /* grant some vision to the player, based on the darklevel */
442 for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++) 470 for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)
443 for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++) 471 for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++)
444 if (!(op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] == 100)) 472 if (!(op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] == 100))
445 op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] -= 473 op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] -=
446 MAX (0, 6 - darklevel - MAX (abs (x), abs (y))); 474 max (0, 6 - darklevel - max (abs (x), abs (y)));
447} 475}
448 476
449/* blinded_sight() - sets all veiwable squares to blocked except 477/* blinded_sight() - sets all viewable squares to blocked except
450 * for the one the central one that the player occupies. A little 478 * for the one the central one that the player occupies. A little
451 * odd that you can see yourself (and what your standing on), but 479 * odd that you can see yourself (and what your standing on), but
452 * really need for any reasonable game play. 480 * really need for any reasonable game play.
453 */ 481 */
454
455static void 482static void
456blinded_sight (object *op) 483blinded_sight (object *op)
457{ 484{
458 int x, y; 485 int x, y;
459 486
… …
466 493
467/* 494/*
468 * update_los() recalculates the array which specifies what is 495 * update_los() recalculates the array which specifies what is
469 * visible for the given player-object. 496 * visible for the given player-object.
470 */ 497 */
471
472void 498void
473update_los (object *op) 499update_los (object *op)
474{ 500{
475 int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y; 501 int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y;
476 502
477 if (QUERY_FLAG (op, FLAG_REMOVED)) 503 if (QUERY_FLAG (op, FLAG_REMOVED))
478 return; 504 return;
479 505
480 clear_los (op); 506 clear_los (op->contr);
507
481 if (QUERY_FLAG (op, FLAG_WIZ) /* ||XRAYS(op) */ ) 508 if (QUERY_FLAG (op, FLAG_WIZ) /* ||XRAYS(op) */ )
482 return; 509 return;
483 510
484 /* For larger maps, this is more efficient than the old way which 511 /* For larger maps, this is more efficient than the old way which
485 * used the chaining of the block array. Since many space views could 512 * used the chaining of the block array. Since many space views could
… …
487 * could be examined multile times, as each path would be looked at. 514 * could be examined multile times, as each path would be looked at.
488 */ 515 */
489 for (x = (MAP_CLIENT_X - op->contr->ns->mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->ns->mapx) / 2 + 1; x++) 516 for (x = (MAP_CLIENT_X - op->contr->ns->mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->ns->mapx) / 2 + 1; x++)
490 for (y = (MAP_CLIENT_Y - op->contr->ns->mapy) / 2 - 1; y < (MAP_CLIENT_Y + op->contr->ns->mapy) / 2 + 1; y++) 517 for (y = (MAP_CLIENT_Y - op->contr->ns->mapy) / 2 - 1; y < (MAP_CLIENT_Y + op->contr->ns->mapy) / 2 + 1; y++)
491 check_wall (op, x, y); 518 check_wall (op, x, y);
492
493 519
494 /* do the los of the player. 3 (potential) cases */ 520 /* do the los of the player. 3 (potential) cases */
495 if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */ 521 if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */
496 blinded_sight (op); 522 blinded_sight (op);
497 else 523 else
498 expand_sight (op); 524 expand_sight (op);
499 525
526 //TODO: no range-checking whatsoever :(
500 if (QUERY_FLAG (op, FLAG_XRAYS)) 527 if (QUERY_FLAG (op, FLAG_XRAYS))
501 {
502 int x, y;
503
504 for (x = -2; x <= 2; x++) 528 for (int x = -2; x <= 2; x++)
505 for (y = -2; y <= 2; y++) 529 for (int y = -2; y <= 2; y++)
506 op->contr->blocked_los[dx + x][dy + y] = 0; 530 op->contr->blocked_los[dx + x][dy + y] = 0;
507 }
508} 531}
509 532
510/* update all_map_los is like update_all_los below, 533/* update all_map_los is like update_all_los below,
511 * but updates everyone on the map, no matter where they 534 * but updates everyone on the map, no matter where they
512 * are. This generally should not be used, as a per 535 * are. This generally should not be used, as a per

Diff Legend

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