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.14 by root, Mon Dec 25 14:54:44 2006 UTC vs.
Revision 1.30 by root, Mon Apr 21 23:35:24 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */ 24/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */
25 25
26#include <global.h> 26#include <global.h>
27#include <funcpoint.h>
28#include <math.h> 27#include <math.h>
29
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.
… …
41{ 39{
42 int x[4], y[4]; 40 int x[4], y[4];
43 int index; 41 int index;
44} blocks; 42} blocks;
45 43
44// 31/32 == a speed hack
45// we would like to use 32 for speed, but the code loops endlessly
46// then, reason not yet identified, so only make the array use 32,
47// not the define's.
46blocks block[MAP_CLIENT_X][MAP_CLIENT_Y]; 48blocks block[MAP_CLIENT_X][MAP_CLIENT_Y == 31 ? 32 : MAP_CLIENT_Y];
47 49
48static void expand_lighted_sight (object *op); 50static void expand_lighted_sight (object *op);
49 51
50/* 52/*
51 * Used to initialise the array used by the LOS routines. 53 * Used to initialise the array used by the LOS routines.
… …
90 92
91void 93void
92init_block (void) 94init_block (void)
93{ 95{
94 int x, y, dx, dy, i; 96 int x, y, dx, dy, i;
95 static int block_x[3] = { -1, -1, 0 }, block_y[3] = 97 static int block_x[3] = { -1, -1, 0 },
96 { 98 block_y[3] = { -1, 0, -1 };
97 -1, 0, -1};
98 99
99 for (x = 0; x < MAP_CLIENT_X; x++) 100 for (x = 0; x < MAP_CLIENT_X; x++)
100 for (y = 0; y < MAP_CLIENT_Y; y++) 101 for (y = 0; y < MAP_CLIENT_Y; y++)
101 {
102 block[x][y].index = 0; 102 block[x][y].index = 0;
103 }
104 103
105 104
106 /* The table should be symmetric, so only do the upper left 105 /* The table should be symmetric, so only do the upper left
107 * quadrant - makes the processing easier. 106 * quadrant - makes the processing easier.
108 */ 107 */
… …
125 /* For simplicity, we mirror the coordinates to block the other 124 /* For simplicity, we mirror the coordinates to block the other
126 * quadrants. 125 * quadrants.
127 */ 126 */
128 set_block (x, y, dx, dy); 127 set_block (x, y, dx, dy);
129 if (x == MAP_CLIENT_X / 2) 128 if (x == MAP_CLIENT_X / 2)
130 {
131 set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1); 129 set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1);
132 }
133 else if (y == MAP_CLIENT_Y / 2) 130 else if (y == MAP_CLIENT_Y / 2)
134 {
135 set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy); 131 set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);
136 }
137 } 132 }
138 else 133 else
139 { 134 {
140 float d1, r, s, l; 135 float d1, r, s, l;
141 136
… …
175 * that if some particular space is blocked, it blocks 170 * that if some particular space is blocked, it blocks
176 * the view of the spaces 'behind' it, and those blocked 171 * the view of the spaces 'behind' it, and those blocked
177 * spaces behind it may block other spaces, etc. 172 * spaces behind it may block other spaces, etc.
178 * In this way, the chain of visibility is set. 173 * In this way, the chain of visibility is set.
179 */ 174 */
180
181static void 175static void
182set_wall (object *op, int x, int y) 176set_wall (object *op, int x, int y)
183{ 177{
184 int i; 178 int i;
185 179
… …
252 * Clears/initialises the los-array associated to the player 246 * Clears/initialises the los-array associated to the player
253 * controlling the object. 247 * controlling the object.
254 */ 248 */
255 249
256void 250void
257clear_los (object *op) 251clear_los (player *pl)
258{ 252{
259 /* This is safer than using the ns->mapx, mapy because 253 /* This is safer than using the ns->mapx, mapy because
260 * we index the blocked_los as a 2 way array, so clearing 254 * 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 255 * the first z spaces may not not cover the spaces we are
262 * actually going to use 256 * actually going to use
263 */ 257 */
264 (void) memset ((void *) op->contr->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y); 258 memset (pl->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y);
265} 259}
266 260
267/* 261/*
268 * expand_sight goes through the array of what the given player is 262 * 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, 263 * able to see, and expands the visible area a bit, so the player will,
… …
296 } 290 }
297 291
298 if (op->map->darkness > 0) /* player is on a dark map */ 292 if (op->map->darkness > 0) /* player is on a dark map */
299 expand_lighted_sight (op); 293 expand_lighted_sight (op);
300 294
301
302 /* clear mark squares */ 295 /* clear mark squares */
303 for (x = 0; x < op->contr->ns->mapx; x++) 296 for (x = 0; x < op->contr->ns->mapx; x++)
304 for (y = 0; y < op->contr->ns->mapy; y++) 297 for (y = 0; y < op->contr->ns->mapy; y++)
305 if (op->contr->blocked_los[x][y] < 0) 298 if (op->contr->blocked_los[x][y] < 0)
306 op->contr->blocked_los[x][y] = 0; 299 op->contr->blocked_los[x][y] = 0;
307} 300}
308 301
309
310
311
312/* returns true if op carries one or more lights 302/* returns true if op carries one or more lights
313 * This is a trivial function now days, but it used to 303 * This is a trivial function now days, but it used to
314 * be a bit longer. Probably better for callers to just 304 * be a bit longer. Probably better for callers to just
315 * check the op->glow_radius instead of calling this. 305 * check the op->glow_radius instead of calling this.
316 */ 306 */
… …
349 /* Do a sanity check. If not valid, some code below may do odd 339 /* Do a sanity check. If not valid, some code below may do odd
350 * things. 340 * things.
351 */ 341 */
352 if (darklevel > MAX_DARKNESS) 342 if (darklevel > MAX_DARKNESS)
353 { 343 {
354 LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, op->map->path, darklevel); 344 LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);
355 darklevel = MAX_DARKNESS; 345 darklevel = MAX_DARKNESS;
356 } 346 }
357 347
358 /* First, limit player furthest (unlighted) vision */ 348 /* First, limit player furthest (unlighted) vision */
359 for (x = 0; x < op->contr->ns->mapx; x++) 349 for (x = 0; x < op->contr->ns->mapx; x++)
… …
394#endif 384#endif
395 for (ax = basex - light; ax <= basex + light; ax++) 385 for (ax = basex - light; ax <= basex + light; ax++)
396 { 386 {
397 if (ax < 0 || ax >= op->contr->ns->mapx) 387 if (ax < 0 || ax >= op->contr->ns->mapx)
398 continue; 388 continue;
389
399 for (ay = basey - light; ay <= basey + light; ay++) 390 for (ay = basey - light; ay <= basey + light; ay++)
400 { 391 {
401 if (ay < 0 || ay >= op->contr->ns->mapy) 392 if (ay < 0 || ay >= op->contr->ns->mapy)
402 continue; 393 continue;
403 394
… …
410 */ 401 */
411 if (op->contr->blocked_los[ax][ay] != 100) 402 if (op->contr->blocked_los[ax][ay] != 100)
412 { 403 {
413 x1 = abs (basex - ax) * abs (basex - ax); 404 x1 = abs (basex - ax) * abs (basex - ax);
414 y1 = abs (basey - ay) * abs (basey - ay); 405 y1 = abs (basey - ay) * abs (basey - ay);
415 if (light > 0) 406
416 op->contr->blocked_los[ax][ay] -= MAX ((light - isqrt (x1 + y1)), 0); 407 if (light > 0) 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); 408 if (light < 0) op->contr->blocked_los[ax][ay] -= min (light + isqrt (x1 + y1), 0);
419 } 409 }
420 } /* for ay */ 410 }
421 } /* for ax */ 411 }
422 } /* if this space is providing light */ 412 }
423 } /* for y */ 413 }
424 } /* for x */ 414 }
425 415
426 /* Outdoor should never really be completely pitch black dark like 416 /* Outdoor should never really be completely pitch black dark like
427 * a dungeon, so let the player at least see a little around themselves 417 * a dungeon, so let the player at least see a little around themselves
428 */ 418 */
429 if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3)) 419 if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3))
… …
436 { 426 {
437 if (op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] > (MAX_DARKNESS - 2)) 427 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; 428 op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] = MAX_DARKNESS - 2;
439 } 429 }
440 } 430 }
431
441 /* grant some vision to the player, based on the darklevel */ 432 /* grant some vision to the player, based on the darklevel */
442 for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++) 433 for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)
443 for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++) 434 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)) 435 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] -= 436 op->contr->blocked_los[x + op->contr->ns->mapx / 2][y + op->contr->ns->mapy / 2] -=
… …
449/* blinded_sight() - sets all veiwable squares to blocked except 440/* blinded_sight() - sets all veiwable squares to blocked except
450 * for the one the central one that the player occupies. A little 441 * 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 442 * odd that you can see yourself (and what your standing on), but
452 * really need for any reasonable game play. 443 * really need for any reasonable game play.
453 */ 444 */
454
455static void 445static void
456blinded_sight (object *op) 446blinded_sight (object *op)
457{ 447{
458 int x, y; 448 int x, y;
459 449
… …
466 456
467/* 457/*
468 * update_los() recalculates the array which specifies what is 458 * update_los() recalculates the array which specifies what is
469 * visible for the given player-object. 459 * visible for the given player-object.
470 */ 460 */
471
472void 461void
473update_los (object *op) 462update_los (object *op)
474{ 463{
475 int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y; 464 int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y;
476 465
477 if (QUERY_FLAG (op, FLAG_REMOVED)) 466 if (QUERY_FLAG (op, FLAG_REMOVED))
478 return; 467 return;
479 468
480 clear_los (op); 469 clear_los (op->contr);
470
481 if (QUERY_FLAG (op, FLAG_WIZ) /* ||XRAYS(op) */ ) 471 if (QUERY_FLAG (op, FLAG_WIZ) /* ||XRAYS(op) */ )
482 return; 472 return;
483 473
484 /* For larger maps, this is more efficient than the old way which 474 /* 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 475 * 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. 477 * could be examined multile times, as each path would be looked at.
488 */ 478 */
489 for (x = (MAP_CLIENT_X - op->contr->ns->mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->ns->mapx) / 2 + 1; x++) 479 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++) 480 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); 481 check_wall (op, x, y);
492
493 482
494 /* do the los of the player. 3 (potential) cases */ 483 /* do the los of the player. 3 (potential) cases */
495 if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */ 484 if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */
496 blinded_sight (op); 485 blinded_sight (op);
497 else 486 else
498 expand_sight (op); 487 expand_sight (op);
499 488
489 //TODO: no range-checking whatsoever :(
500 if (QUERY_FLAG (op, FLAG_XRAYS)) 490 if (QUERY_FLAG (op, FLAG_XRAYS))
501 {
502 int x, y;
503
504 for (x = -2; x <= 2; x++) 491 for (int x = -2; x <= 2; x++)
505 for (y = -2; y <= 2; y++) 492 for (int y = -2; y <= 2; y++)
506 op->contr->blocked_los[dx + x][dy + y] = 0; 493 op->contr->blocked_los[dx + x][dy + y] = 0;
507 }
508} 494}
509 495
510/* update all_map_los is like update_all_los below, 496/* update all_map_los is like update_all_los below,
511 * but updates everyone on the map, no matter where they 497 * but updates everyone on the map, no matter where they
512 * are. This generally should not be used, as a per 498 * are. This generally should not be used, as a per

Diff Legend

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