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.6 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.26 by root, Mon May 28 21:21:40 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */ 25/* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */
25 26
26#include <global.h> 27#include <global.h>
27#include <funcpoint.h> 28#include <funcpoint.h>
28#include <math.h> 29#include <math.h>
29
30 30
31/* Distance must be less than this for the object to be blocked. 31/* 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 32 * 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 33 * that blocks half the view (0.0 is complete block) will
34 * block view in our tables. 34 * block view in our tables.
… …
41{ 41{
42 int x[4], y[4]; 42 int x[4], y[4];
43 int index; 43 int index;
44} blocks; 44} blocks;
45 45
46// 31/32 == a speed hack
47// we would like to use 32 for speed, but the code loops endlessly
48// then, reason not yet identified, so only make the array use 32,
49// not the define's.
46blocks block[MAP_CLIENT_X][MAP_CLIENT_Y]; 50blocks block[MAP_CLIENT_X][MAP_CLIENT_Y == 31 ? 32 : MAP_CLIENT_Y];
47 51
48static void expand_lighted_sight (object *op); 52static void expand_lighted_sight (object *op);
49 53
50/* 54/*
51 * Used to initialise the array used by the LOS routines. 55 * Used to initialise the array used by the LOS routines.
… …
90 94
91void 95void
92init_block (void) 96init_block (void)
93{ 97{
94 int x, y, dx, dy, i; 98 int x, y, dx, dy, i;
95 static int block_x[3] = { -1, -1, 0 }, block_y[3] = 99 static int block_x[3] = { -1, -1, 0 },
96 { 100 block_y[3] = { -1, 0, -1 };
97 -1, 0, -1};
98 101
99 for (x = 0; x < MAP_CLIENT_X; x++) 102 for (x = 0; x < MAP_CLIENT_X; x++)
100 for (y = 0; y < MAP_CLIENT_Y; y++) 103 for (y = 0; y < MAP_CLIENT_Y; y++)
101 {
102 block[x][y].index = 0; 104 block[x][y].index = 0;
103 }
104 105
105 106
106 /* The table should be symmetric, so only do the upper left 107 /* The table should be symmetric, so only do the upper left
107 * quadrant - makes the processing easier. 108 * quadrant - makes the processing easier.
108 */ 109 */
… …
125 /* For simplicity, we mirror the coordinates to block the other 126 /* For simplicity, we mirror the coordinates to block the other
126 * quadrants. 127 * quadrants.
127 */ 128 */
128 set_block (x, y, dx, dy); 129 set_block (x, y, dx, dy);
129 if (x == MAP_CLIENT_X / 2) 130 if (x == MAP_CLIENT_X / 2)
130 {
131 set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1); 131 set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1);
132 }
133 else if (y == MAP_CLIENT_Y / 2) 132 else if (y == MAP_CLIENT_Y / 2)
134 {
135 set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy); 133 set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy);
136 }
137 } 134 }
138 else 135 else
139 { 136 {
140 float d1, r, s, l; 137 float d1, r, s, l;
141 138
… …
144 * area. l is the distance from x,y to the line. 141 * area. l is the distance from x,y to the line.
145 * r is more a curiosity - it lets us know what direction (left/right) 142 * r is more a curiosity - it lets us know what direction (left/right)
146 * the line is off 143 * the line is off
147 */ 144 */
148 145
149 d1 = (float) (pow (MAP_CLIENT_X / 2 - dx, 2) + pow (MAP_CLIENT_Y / 2 - dy, 2)); 146 d1 = (float) (pow (MAP_CLIENT_X / 2 - dx, 2.f) + pow (MAP_CLIENT_Y / 2 - dy, 2.f));
150 r = (float) ((dy - y) * (dy - MAP_CLIENT_Y / 2) - (dx - x) * (MAP_CLIENT_X / 2 - dx)) / d1; 147 r = (float) ((dy - y) * (dy - MAP_CLIENT_Y / 2) - (dx - x) * (MAP_CLIENT_X / 2 - dx)) / d1;
151 s = (float) ((dy - y) * (MAP_CLIENT_X / 2 - dx) - (dx - x) * (MAP_CLIENT_Y / 2 - dy)) / d1; 148 s = (float) ((dy - y) * (MAP_CLIENT_X / 2 - dx) - (dx - x) * (MAP_CLIENT_Y / 2 - dy)) / d1;
152 l = FABS (sqrt (d1) * s); 149 l = FABS (sqrt (d1) * s);
153 150
154 if (l <= SPACE_BLOCK) 151 if (l <= SPACE_BLOCK)
… …
175 * that if some particular space is blocked, it blocks 172 * that if some particular space is blocked, it blocks
176 * the view of the spaces 'behind' it, and those blocked 173 * the view of the spaces 'behind' it, and those blocked
177 * spaces behind it may block other spaces, etc. 174 * spaces behind it may block other spaces, etc.
178 * In this way, the chain of visibility is set. 175 * In this way, the chain of visibility is set.
179 */ 176 */
180
181static void 177static void
182set_wall (object *op, int x, int y) 178set_wall (object *op, int x, int y)
183{ 179{
184 int i; 180 int i;
185 181
… …
188 int dx = block[x][y].x[i], dy = block[x][y].y[i], ax, ay; 184 int dx = block[x][y].x[i], dy = block[x][y].y[i], ax, ay;
189 185
190 /* ax, ay are the values as adjusted to be in the 186 /* ax, ay are the values as adjusted to be in the
191 * socket look structure. 187 * socket look structure.
192 */ 188 */
193 ax = dx - (MAP_CLIENT_X - op->contr->socket.mapx) / 2; 189 ax = dx - (MAP_CLIENT_X - op->contr->ns->mapx) / 2;
194 ay = dy - (MAP_CLIENT_Y - op->contr->socket.mapy) / 2; 190 ay = dy - (MAP_CLIENT_Y - op->contr->ns->mapy) / 2;
195 191
196 if (ax < 0 || ax >= op->contr->socket.mapx || ay < 0 || ay >= op->contr->socket.mapy) 192 if (ax < 0 || ax >= op->contr->ns->mapx || ay < 0 || ay >= op->contr->ns->mapy)
197 continue; 193 continue;
198#if 0 194#if 0
199 LOG (llevDebug, "blocked %d %d -> %d %d\n", dx, dy, ax, ay); 195 LOG (llevDebug, "blocked %d %d -> %d %d\n", dx, dy, ax, ay);
200#endif 196#endif
201 /* we need to adjust to the fact that the socket 197 /* we need to adjust to the fact that the socket
… …
220 216
221 if (!block[x][y].index) 217 if (!block[x][y].index)
222 return; 218 return;
223 219
224 /* ax, ay are coordinates as indexed into the look window */ 220 /* ax, ay are coordinates as indexed into the look window */
225 ax = x - (MAP_CLIENT_X - op->contr->socket.mapx) / 2; 221 ax = x - (MAP_CLIENT_X - op->contr->ns->mapx) / 2;
226 ay = y - (MAP_CLIENT_Y - op->contr->socket.mapy) / 2; 222 ay = y - (MAP_CLIENT_Y - op->contr->ns->mapy) / 2;
227 223
228 /* If the converted coordinates are outside the viewable 224 /* If the converted coordinates are outside the viewable
229 * area for the client, return now. 225 * area for the client, return now.
230 */ 226 */
231 if (ax < 0 || ay < 0 || ax >= op->contr->socket.mapx || ay >= op->contr->socket.mapy) 227 if (ax < 0 || ay < 0 || ax >= op->contr->ns->mapx || ay >= op->contr->ns->mapy)
232 return; 228 return;
233 229
234#if 0 230#if 0
235 LOG (llevDebug, "check_wall, ax,ay=%d, %d x,y = %d, %d blocksview = %d, %d\n", 231 LOG (llevDebug, "check_wall, ax,ay=%d, %d x,y = %d, %d blocksview = %d, %d\n",
236 ax, ay, x, y, op->x + x - MAP_CLIENT_X / 2, op->y + y - MAP_CLIENT_Y / 2); 232 ax, ay, x, y, op->x + x - MAP_CLIENT_X / 2, op->y + y - MAP_CLIENT_Y / 2);
… …
254 */ 250 */
255 251
256void 252void
257clear_los (object *op) 253clear_los (object *op)
258{ 254{
259 /* This is safer than using the socket->mapx, mapy because 255 /* This is safer than using the ns->mapx, mapy because
260 * we index the blocked_los as a 2 way array, so clearing 256 * 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 257 * the first z spaces may not not cover the spaces we are
262 * actually going to use 258 * actually going to use
263 */ 259 */
264 (void) memset ((void *) op->contr->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y); 260 (void) memset ((void *) op->contr->blocked_los, 0, MAP_CLIENT_X * MAP_CLIENT_Y);
… …
274static void 270static void
275expand_sight (object *op) 271expand_sight (object *op)
276{ 272{
277 int i, x, y, dx, dy; 273 int i, x, y, dx, dy;
278 274
279 for (x = 1; x < op->contr->socket.mapx - 1; x++) /* loop over inner squares */ 275 for (x = 1; x < op->contr->ns->mapx - 1; x++) /* loop over inner squares */
280 for (y = 1; y < op->contr->socket.mapy - 1; y++) 276 for (y = 1; y < op->contr->ns->mapy - 1; y++)
281 { 277 {
282 if (!op->contr->blocked_los[x][y] && 278 if (!op->contr->blocked_los[x][y] &&
283 !(get_map_flags (op->map, NULL, 279 !(get_map_flags (op->map, NULL,
284 op->x - op->contr->socket.mapx / 2 + x, 280 op->x - op->contr->ns->mapx / 2 + x,
285 op->y - op->contr->socket.mapy / 2 + y, NULL, NULL) & (P_BLOCKSVIEW | P_OUT_OF_MAP))) 281 op->y - op->contr->ns->mapy / 2 + y, NULL, NULL) & (P_BLOCKSVIEW | P_OUT_OF_MAP)))
286 { 282 {
287 283
288 for (i = 1; i <= 8; i += 1) 284 for (i = 1; i <= 8; i += 1)
289 { /* mark all directions */ 285 { /* mark all directions */
290 dx = x + freearr_x[i]; 286 dx = x + freearr_x[i];
… …
293 op->contr->blocked_los[dx][dy] = -1; 289 op->contr->blocked_los[dx][dy] = -1;
294 } 290 }
295 } 291 }
296 } 292 }
297 293
298 if (MAP_DARKNESS (op->map) > 0) /* player is on a dark map */ 294 if (op->map->darkness > 0) /* player is on a dark map */
299 expand_lighted_sight (op); 295 expand_lighted_sight (op);
300 296
301
302 /* clear mark squares */ 297 /* clear mark squares */
303 for (x = 0; x < op->contr->socket.mapx; x++) 298 for (x = 0; x < op->contr->ns->mapx; x++)
304 for (y = 0; y < op->contr->socket.mapy; y++) 299 for (y = 0; y < op->contr->ns->mapy; y++)
305 if (op->contr->blocked_los[x][y] < 0) 300 if (op->contr->blocked_los[x][y] < 0)
306 op->contr->blocked_los[x][y] = 0; 301 op->contr->blocked_los[x][y] = 0;
307} 302}
308
309
310
311 303
312/* returns true if op carries one or more lights 304/* returns true if op carries one or more lights
313 * This is a trivial function now days, but it used to 305 * This is a trivial function now days, but it used to
314 * be a bit longer. Probably better for callers to just 306 * be a bit longer. Probably better for callers to just
315 * check the op->glow_radius instead of calling this. 307 * check the op->glow_radius instead of calling this.
… …
330{ 322{
331 int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1; 323 int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1;
332 maptile *m = op->map; 324 maptile *m = op->map;
333 sint16 nx, ny; 325 sint16 nx, ny;
334 326
335 darklevel = MAP_DARKNESS (m); 327 darklevel = m->darkness;
336 328
337 /* If the player can see in the dark, lower the darklevel for him */ 329 /* If the player can see in the dark, lower the darklevel for him */
338 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) 330 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
339 darklevel -= 2; 331 darklevel -= 2;
340 332
… …
349 /* Do a sanity check. If not valid, some code below may do odd 341 /* Do a sanity check. If not valid, some code below may do odd
350 * things. 342 * things.
351 */ 343 */
352 if (darklevel > MAX_DARKNESS) 344 if (darklevel > MAX_DARKNESS)
353 { 345 {
354 LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, op->map->path, darklevel); 346 LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);
355 darklevel = MAX_DARKNESS; 347 darklevel = MAX_DARKNESS;
356 } 348 }
357 349
358 /* First, limit player furthest (unlighted) vision */ 350 /* First, limit player furthest (unlighted) vision */
359 for (x = 0; x < op->contr->socket.mapx; x++) 351 for (x = 0; x < op->contr->ns->mapx; x++)
360 for (y = 0; y < op->contr->socket.mapy; y++) 352 for (y = 0; y < op->contr->ns->mapy; y++)
361 if (op->contr->blocked_los[x][y] != 100) 353 if (op->contr->blocked_los[x][y] != 100)
362 op->contr->blocked_los[x][y] = MAX_LIGHT_RADII; 354 op->contr->blocked_los[x][y] = MAX_LIGHT_RADII;
363 355
364 /* the spaces[] darkness value contains the information we need. 356 /* the spaces[] darkness value contains the information we need.
365 * Only process the area of interest. 357 * Only process the area of interest.
366 * the basex, basey values represent the position in the op->contr->blocked_los 358 * 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 359 * array. Its easier to just increment them here (and start with the right
368 * value) than to recalculate them down below. 360 * value) than to recalculate them down below.
369 */ 361 */
370 for (x = (op->x - op->contr->socket.mapx / 2 - MAX_LIGHT_RADII), basex = -MAX_LIGHT_RADII; 362 for (x = (op->x - op->contr->ns->mapx / 2 - MAX_LIGHT_RADII), basex = -MAX_LIGHT_RADII;
371 x <= (op->x + op->contr->socket.mapx / 2 + MAX_LIGHT_RADII); x++, basex++) 363 x <= (op->x + op->contr->ns->mapx / 2 + MAX_LIGHT_RADII); x++, basex++)
372 { 364 {
373 365
374 for (y = (op->y - op->contr->socket.mapy / 2 - MAX_LIGHT_RADII), basey = -MAX_LIGHT_RADII; 366 for (y = (op->y - op->contr->ns->mapy / 2 - MAX_LIGHT_RADII), basey = -MAX_LIGHT_RADII;
375 y <= (op->y + op->contr->socket.mapy / 2 + MAX_LIGHT_RADII); y++, basey++) 367 y <= (op->y + op->contr->ns->mapy / 2 + MAX_LIGHT_RADII); y++, basey++)
376 { 368 {
377 m = op->map; 369 m = op->map;
378 nx = x; 370 nx = x;
379 ny = y; 371 ny = y;
380 372
… …
392#if 0 384#if 0
393 LOG (llevDebug, "expand_lighted_sight: Found light at x=%d, y=%d, basex=%d, basey=%d\n", x, y, basex, basey); 385 LOG (llevDebug, "expand_lighted_sight: Found light at x=%d, y=%d, basex=%d, basey=%d\n", x, y, basex, basey);
394#endif 386#endif
395 for (ax = basex - light; ax <= basex + light; ax++) 387 for (ax = basex - light; ax <= basex + light; ax++)
396 { 388 {
397 if (ax < 0 || ax >= op->contr->socket.mapx) 389 if (ax < 0 || ax >= op->contr->ns->mapx)
398 continue; 390 continue;
391
399 for (ay = basey - light; ay <= basey + light; ay++) 392 for (ay = basey - light; ay <= basey + light; ay++)
400 { 393 {
401 if (ay < 0 || ay >= op->contr->socket.mapy) 394 if (ay < 0 || ay >= op->contr->ns->mapy)
402 continue; 395 continue;
403 396
404 /* If the space is fully blocked, do nothing. Otherwise, we 397 /* If the space is fully blocked, do nothing. Otherwise, we
405 * brighten the space. The further the light is away from the 398 * brighten the space. The further the light is away from the
406 * source (basex-x), the less effect it has. Though light used 399 * source (basex-x), the less effect it has. Though light used
… …
410 */ 403 */
411 if (op->contr->blocked_los[ax][ay] != 100) 404 if (op->contr->blocked_los[ax][ay] != 100)
412 { 405 {
413 x1 = abs (basex - ax) * abs (basex - ax); 406 x1 = abs (basex - ax) * abs (basex - ax);
414 y1 = abs (basey - ay) * abs (basey - ay); 407 y1 = abs (basey - ay) * abs (basey - ay);
415 if (light > 0) 408
416 op->contr->blocked_los[ax][ay] -= MAX ((light - isqrt (x1 + y1)), 0); 409 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); 410 if (light < 0) op->contr->blocked_los[ax][ay] -= min (light + isqrt (x1 + y1), 0);
419 } 411 }
420 } /* for ay */ 412 }
421 } /* for ax */ 413 }
422 } /* if this space is providing light */ 414 }
423 } /* for y */ 415 }
424 } /* for x */ 416 }
425 417
426 /* Outdoor should never really be completely pitch black dark like 418 /* Outdoor should never really be completely pitch black dark like
427 * a dungeon, so let the player at least see a little around themselves 419 * a dungeon, so let the player at least see a little around themselves
428 */ 420 */
429 if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3)) 421 if (op->map->outdoor && darklevel > (MAX_DARKNESS - 3))
430 { 422 {
431 if (op->contr->blocked_los[op->contr->socket.mapx / 2][op->contr->socket.mapy / 2] > (MAX_DARKNESS - 3)) 423 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->socket.mapx / 2][op->contr->socket.mapy / 2] = MAX_DARKNESS - 3; 424 op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = MAX_DARKNESS - 3;
433 425
434 for (x = -1; x <= 1; x++) 426 for (x = -1; x <= 1; x++)
435 for (y = -1; y <= 1; y++) 427 for (y = -1; y <= 1; y++)
436 { 428 {
437 if (op->contr->blocked_los[x + op->contr->socket.mapx / 2][y + op->contr->socket.mapy / 2] > (MAX_DARKNESS - 2)) 429 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->socket.mapx / 2][y + op->contr->socket.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;
439 } 431 }
440 } 432 }
433
441 /* grant some vision to the player, based on the darklevel */ 434 /* grant some vision to the player, based on the darklevel */
442 for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++) 435 for (x = darklevel - MAX_DARKNESS; x < MAX_DARKNESS + 1 - darklevel; x++)
443 for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++) 436 for (y = darklevel - MAX_DARKNESS; y < MAX_DARKNESS + 1 - darklevel; y++)
444 if (!(op->contr->blocked_los[x + op->contr->socket.mapx / 2][y + op->contr->socket.mapy / 2] == 100)) 437 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->socket.mapx / 2][y + op->contr->socket.mapy / 2] -= 438 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))); 439 MAX (0, 6 - darklevel - MAX (abs (x), abs (y)));
447} 440}
448 441
449/* blinded_sight() - sets all veiwable squares to blocked except 442/* blinded_sight() - sets all veiwable squares to blocked except
450 * for the one the central one that the player occupies. A little 443 * 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 444 * odd that you can see yourself (and what your standing on), but
452 * really need for any reasonable game play. 445 * really need for any reasonable game play.
453 */ 446 */
454
455static void 447static void
456blinded_sight (object *op) 448blinded_sight (object *op)
457{ 449{
458 int x, y; 450 int x, y;
459 451
460 for (x = 0; x < op->contr->socket.mapx; x++) 452 for (x = 0; x < op->contr->ns->mapx; x++)
461 for (y = 0; y < op->contr->socket.mapy; y++) 453 for (y = 0; y < op->contr->ns->mapy; y++)
462 op->contr->blocked_los[x][y] = 100; 454 op->contr->blocked_los[x][y] = 100;
463 455
464 op->contr->blocked_los[op->contr->socket.mapx / 2][op->contr->socket.mapy / 2] = 0; 456 op->contr->blocked_los[op->contr->ns->mapx / 2][op->contr->ns->mapy / 2] = 0;
465} 457}
466 458
467/* 459/*
468 * update_los() recalculates the array which specifies what is 460 * update_los() recalculates the array which specifies what is
469 * visible for the given player-object. 461 * visible for the given player-object.
470 */ 462 */
471 463
472void 464void
473update_los (object *op) 465update_los (object *op)
474{ 466{
475 int dx = op->contr->socket.mapx / 2, dy = op->contr->socket.mapy / 2, x, y; 467 int dx = op->contr->ns->mapx / 2, dy = op->contr->ns->mapy / 2, x, y;
476 468
477 if (QUERY_FLAG (op, FLAG_REMOVED)) 469 if (QUERY_FLAG (op, FLAG_REMOVED))
478 return; 470 return;
479 471
480 clear_los (op); 472 clear_los (op);
… …
484 /* For larger maps, this is more efficient than the old way which 476 /* 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 477 * used the chaining of the block array. Since many space views could
486 * be blocked by different spaces in front, this mean that a lot of spaces 478 * be blocked by different spaces in front, this mean that a lot of spaces
487 * could be examined multile times, as each path would be looked at. 479 * could be examined multile times, as each path would be looked at.
488 */ 480 */
489 for (x = (MAP_CLIENT_X - op->contr->socket.mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->socket.mapx) / 2 + 1; x++) 481 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->socket.mapy) / 2 - 1; y < (MAP_CLIENT_Y + op->contr->socket.mapy) / 2 + 1; y++) 482 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); 483 check_wall (op, x, y);
492
493 484
494 /* do the los of the player. 3 (potential) cases */ 485 /* do the los of the player. 3 (potential) cases */
495 if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */ 486 if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */
496 blinded_sight (op); 487 blinded_sight (op);
497 else 488 else
498 expand_sight (op); 489 expand_sight (op);
499 490
491 //TODO: no range-checking whatsoever :(
500 if (QUERY_FLAG (op, FLAG_XRAYS)) 492 if (QUERY_FLAG (op, FLAG_XRAYS))
501 {
502 int x, y;
503
504 for (x = -2; x <= 2; x++) 493 for (int x = -2; x <= 2; x++)
505 for (y = -2; y <= 2; y++) 494 for (int y = -2; y <= 2; y++)
506 op->contr->blocked_los[dx + x][dy + y] = 0; 495 op->contr->blocked_los[dx + x][dy + y] = 0;
507 }
508} 496}
509 497
510/* update all_map_los is like update_all_los below, 498/* update all_map_los is like update_all_los below,
511 * but updates everyone on the map, no matter where they 499 * but updates everyone on the map, no matter where they
512 * are. This generally should not be used, as a per 500 * are. This generally should not be used, as a per
513 * specific map change doesn't make much sense when tiling 501 * specific map change doesn't make much sense when tiling
514 * is considered (lowering darkness would certainly be a 502 * is considered (lowering darkness would certainly be a
515 * strange effect if done on a tile map, as it makes 503 * strange effect if done on a tile map, as it makes
516 * the distinction between maps much more obvious to the 504 * the distinction between maps much more obvious to the
517 * players, which is should not be. 505 * players, which is should not be.
… …
519 * change_map_light function 507 * change_map_light function
520 */ 508 */
521void 509void
522update_all_map_los (maptile *map) 510update_all_map_los (maptile *map)
523{ 511{
524 player *pl; 512 for_all_players (pl)
525
526 for (pl = first_player; pl != NULL; pl = pl->next)
527 {
528 if (pl->ob->map == map) 513 if (pl->ob && pl->ob->map == map)
529 pl->do_los = 1; 514 pl->do_los = 1;
530 }
531} 515}
532
533 516
534/* 517/*
535 * This function makes sure that update_los() will be called for all 518 * This function makes sure that update_los() will be called for all
536 * players on the given map within the next frame. 519 * players on the given map within the next frame.
537 * It is triggered by removal or inserting of objects which blocks 520 * It is triggered by removal or inserting of objects which blocks
… …
541 * means that just being on the same map is not sufficient - the 524 * means that just being on the same map is not sufficient - the
542 * space that changes must be withing your viewable area. 525 * space that changes must be withing your viewable area.
543 * 526 *
544 * map is the map that changed, x and y are the coordinates. 527 * map is the map that changed, x and y are the coordinates.
545 */ 528 */
546
547void 529void
548update_all_los (const maptile *map, int x, int y) 530update_all_los (const maptile *map, int x, int y)
549{ 531{
550 player *pl; 532 for_all_players (pl)
551
552 for (pl = first_player; pl != NULL; pl = pl->next)
553 { 533 {
554 /* Player should not have a null map, but do this 534 /* Player should not have a null map, but do this
555 * check as a safety 535 * check as a safety
556 */ 536 */
557 if (!pl->ob->map) 537 if (!pl->ob || !pl->ob->map || !pl->ns)
558 continue; 538 continue;
559 539
560 /* Same map is simple case - see if pl is close enough. 540 /* Same map is simple case - see if pl is close enough.
561 * Note in all cases, we did the check for same map first, 541 * Note in all cases, we did the check for same map first,
562 * and then see if the player is close enough and update 542 * and then see if the player is close enough and update
… …
566 * so by setting it up this way, we trim processing 546 * so by setting it up this way, we trim processing
567 * some. 547 * some.
568 */ 548 */
569 if (pl->ob->map == map) 549 if (pl->ob->map == map)
570 { 550 {
571 if ((abs (pl->ob->x - x) <= pl->socket.mapx / 2) && (abs (pl->ob->y - y) <= pl->socket.mapy / 2)) 551 if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
572 pl->do_los = 1; 552 pl->do_los = 1;
573 } 553 }
554
574 /* Now we check to see if player is on adjacent 555 /* Now we check to see if player is on adjacent
575 * maps to the one that changed and also within 556 * maps to the one that changed and also within
576 * view. The tile_maps[] could be null, but in that 557 * view. The tile_maps[] could be null, but in that
577 * case it should never match the pl->ob->map, so 558 * case it should never match the pl->ob->map, so
578 * we want ever try to dereference any of the data in it. 559 * we want ever try to dereference any of the data in it.
579 */ 560 *
580
581 /* The logic for 0 and 3 is to see how far the player is 561 * The logic for 0 and 3 is to see how far the player is
582 * from the edge of the map (height/width) - pl->ob->(x,y) 562 * from the edge of the map (height/width) - pl->ob->(x,y)
583 * and to add current position on this map - that gives a 563 * and to add current position on this map - that gives a
584 * distance. 564 * distance.
585 * For 1 and 2, we check to see how far the given 565 * For 1 and 2, we check to see how far the given
586 * coordinate (x,y) is from the corresponding edge, 566 * coordinate (x,y) is from the corresponding edge,
587 * and then add the players location, which gives 567 * and then add the players location, which gives
588 * a distance. 568 * a distance.
589 */ 569 */
590 else if (pl->ob->map == map->tile_map[0]) 570 else if (pl->ob->map == map->tile_map[0])
591 { 571 {
592 if ((abs (pl->ob->x - x) <= pl->socket.mapx / 2) && (abs (y + MAP_HEIGHT (map->tile_map[0]) - pl->ob->y) <= pl->socket.mapy / 2)) 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))
593 pl->do_los = 1; 573 pl->do_los = 1;
594 } 574 }
595 else if (pl->ob->map == map->tile_map[2]) 575 else if (pl->ob->map == map->tile_map[2])
596 { 576 {
597 if ((abs (pl->ob->x - x) <= pl->socket.mapx / 2) && (abs (pl->ob->y + MAP_HEIGHT (map) - y) <= pl->socket.mapy / 2)) 577 if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y + map->height - y) <= pl->ns->mapy / 2))
598 pl->do_los = 1; 578 pl->do_los = 1;
599 } 579 }
600 else if (pl->ob->map == map->tile_map[1]) 580 else if (pl->ob->map == map->tile_map[1])
601 { 581 {
602 if ((abs (pl->ob->x + MAP_WIDTH (map) - x) <= pl->socket.mapx / 2) && (abs (pl->ob->y - y) <= pl->socket.mapy / 2)) 582 if ((abs (pl->ob->x + map->width - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
603 pl->do_los = 1; 583 pl->do_los = 1;
604 } 584 }
605 else if (pl->ob->map == map->tile_map[3]) 585 else if (pl->ob->map == map->tile_map[3])
606 { 586 {
607 if ((abs (x + MAP_WIDTH (map->tile_map[3]) - pl->ob->x) <= pl->socket.mapx / 2) && (abs (pl->ob->y - y) <= pl->socket.mapy / 2)) 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))
608 pl->do_los = 1; 588 pl->do_los = 1;
609 } 589 }
610 } 590 }
611} 591}
612 592
613/* 593/*
614 * Debug-routine which dumps the array which specifies the visible 594 * Debug-routine which dumps the array which specifies the visible
615 * area of a player. Triggered by the z key in DM mode. 595 * area of a player. Triggered by the z key in DM mode.
616 */ 596 */
617
618void 597void
619print_los (object *op) 598print_los (object *op)
620{ 599{
621 int x, y; 600 int x, y;
622 char buf[50], buf2[10]; 601 char buf[50], buf2[10];
623 602
624 strcpy (buf, " "); 603 strcpy (buf, " ");
604
625 for (x = 0; x < op->contr->socket.mapx; x++) 605 for (x = 0; x < op->contr->ns->mapx; x++)
626 { 606 {
627 sprintf (buf2, "%2d", x); 607 sprintf (buf2, "%2d", x);
628 strcat (buf, buf2); 608 strcat (buf, buf2);
629 } 609 }
610
630 new_draw_info (NDI_UNIQUE, 0, op, buf); 611 new_draw_info (NDI_UNIQUE, 0, op, buf);
612
631 for (y = 0; y < op->contr->socket.mapy; y++) 613 for (y = 0; y < op->contr->ns->mapy; y++)
632 { 614 {
633 sprintf (buf, "%2d:", y); 615 sprintf (buf, "%2d:", y);
616
634 for (x = 0; x < op->contr->socket.mapx; x++) 617 for (x = 0; x < op->contr->ns->mapx; x++)
635 { 618 {
636 sprintf (buf2, " %1d", op->contr->blocked_los[x][y]); 619 sprintf (buf2, " %1d", op->contr->blocked_los[x][y]);
637 strcat (buf, buf2); 620 strcat (buf, buf2);
638 } 621 }
622
639 new_draw_info (NDI_UNIQUE, 0, op, buf); 623 new_draw_info (NDI_UNIQUE, 0, op, buf);
640 } 624 }
641} 625}
642 626
643/* 627/*
… …
646 */ 630 */
647 631
648void 632void
649make_sure_seen (const object *op) 633make_sure_seen (const object *op)
650{ 634{
651 player *pl; 635 for_all_players (pl)
652
653 for (pl = first_player; pl; pl = pl->next)
654 if (pl->ob->map == op->map && 636 if (pl->ob->map == op->map &&
655 pl->ob->y - pl->socket.mapy / 2 <= op->y && 637 pl->ob->y - pl->ns->mapy / 2 <= op->y &&
656 pl->ob->y + pl->socket.mapy / 2 >= op->y && pl->ob->x - pl->socket.mapx / 2 <= op->x && pl->ob->x + pl->socket.mapx / 2 >= op->x) 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)
657 pl->blocked_los[pl->socket.mapx / 2 + op->x - pl->ob->x][pl->socket.mapy / 2 + op->y - pl->ob->y] = 0; 639 pl->blocked_los[pl->ns->mapx / 2 + op->x - pl->ob->x][pl->ns->mapy / 2 + op->y - pl->ob->y] = 0;
658} 640}
659 641
660/* 642/*
661 * make_sure_not_seen: The object which is supposed to be visible through 643 * make_sure_not_seen: The object which is supposed to be visible through
662 * walls has just been removed from the map, so update the los of any 644 * walls has just been removed from the map, so update the los of any
… …
664 */ 646 */
665 647
666void 648void
667make_sure_not_seen (const object *op) 649make_sure_not_seen (const object *op)
668{ 650{
669 player *pl; 651 for_all_players (pl)
670
671 for (pl = first_player; pl; pl = pl->next)
672 if (pl->ob->map == op->map && 652 if (pl->ob->map == op->map &&
673 pl->ob->y - pl->socket.mapy / 2 <= op->y && 653 pl->ob->y - pl->ns->mapy / 2 <= op->y &&
674 pl->ob->y + pl->socket.mapy / 2 >= op->y && pl->ob->x - pl->socket.mapx / 2 <= op->x && pl->ob->x + pl->socket.mapx / 2 >= op->x) 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)
675 pl->do_los = 1; 655 pl->do_los = 1;
676} 656}

Diff Legend

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