… | |
… | |
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. |
46 | blocks block[MAP_CLIENT_X][MAP_CLIENT_Y]; |
50 | blocks block[MAP_CLIENT_X][MAP_CLIENT_Y == 31 ? 32 : MAP_CLIENT_Y]; |
47 | |
51 | |
48 | static void expand_lighted_sight (object *op); |
52 | static 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. |
… | |
… | |
296 | } |
300 | } |
297 | |
301 | |
298 | if (op->map->darkness > 0) /* player is on a dark map */ |
302 | if (op->map->darkness > 0) /* player is on a dark map */ |
299 | expand_lighted_sight (op); |
303 | expand_lighted_sight (op); |
300 | |
304 | |
301 | |
|
|
302 | /* clear mark squares */ |
305 | /* clear mark squares */ |
303 | for (x = 0; x < op->contr->ns->mapx; x++) |
306 | for (x = 0; x < op->contr->ns->mapx; x++) |
304 | for (y = 0; y < op->contr->ns->mapy; y++) |
307 | for (y = 0; y < op->contr->ns->mapy; y++) |
305 | if (op->contr->blocked_los[x][y] < 0) |
308 | if (op->contr->blocked_los[x][y] < 0) |
306 | op->contr->blocked_los[x][y] = 0; |
309 | op->contr->blocked_los[x][y] = 0; |
307 | } |
310 | } |
308 | |
|
|
309 | |
|
|
310 | |
|
|
311 | |
311 | |
312 | /* returns true if op carries one or more lights |
312 | /* returns true if op carries one or more lights |
313 | * This is a trivial function now days, but it used to |
313 | * This is a trivial function now days, but it used to |
314 | * be a bit longer. Probably better for callers to just |
314 | * be a bit longer. Probably better for callers to just |
315 | * check the op->glow_radius instead of calling this. |
315 | * check the op->glow_radius instead of calling this. |
… | |
… | |
488 | */ |
488 | */ |
489 | for (x = (MAP_CLIENT_X - op->contr->ns->mapx) / 2 - 1; x < (MAP_CLIENT_X + op->contr->ns->mapx) / 2 + 1; x++) |
489 | 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++) |
490 | 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); |
491 | check_wall (op, x, y); |
492 | |
492 | |
493 | |
|
|
494 | /* do the los of the player. 3 (potential) cases */ |
493 | /* do the los of the player. 3 (potential) cases */ |
495 | if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */ |
494 | if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */ |
496 | blinded_sight (op); |
495 | blinded_sight (op); |
497 | else |
496 | else |
498 | expand_sight (op); |
497 | expand_sight (op); |
499 | |
498 | |
|
|
499 | //TODO: no range-checking whatsoever :( |
500 | if (QUERY_FLAG (op, FLAG_XRAYS)) |
500 | if (QUERY_FLAG (op, FLAG_XRAYS)) |
501 | { |
|
|
502 | int x, y; |
|
|
503 | |
|
|
504 | for (x = -2; x <= 2; x++) |
501 | for (int x = -2; x <= 2; x++) |
505 | for (y = -2; y <= 2; y++) |
502 | for (int y = -2; y <= 2; y++) |
506 | op->contr->blocked_los[dx + x][dy + y] = 0; |
503 | op->contr->blocked_los[dx + x][dy + y] = 0; |
507 | } |
|
|
508 | } |
504 | } |
509 | |
505 | |
510 | /* update all_map_los is like update_all_los below, |
506 | /* update all_map_los is like update_all_los below, |
511 | * but updates everyone on the map, no matter where they |
507 | * but updates everyone on the map, no matter where they |
512 | * are. This generally should not be used, as a per |
508 | * are. This generally should not be used, as a per |