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.4 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.24 by root, Sun Mar 11 02:12:44 2007 UTC

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

Diff Legend

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