… | |
… | |
293 | op->contr->blocked_los[dx][dy] = -1; |
293 | op->contr->blocked_los[dx][dy] = -1; |
294 | } |
294 | } |
295 | } |
295 | } |
296 | } |
296 | } |
297 | |
297 | |
298 | if (MAP_DARKNESS (op->map) > 0) /* player is on a dark map */ |
298 | if (op->map->darkness > 0) /* player is on a dark map */ |
299 | expand_lighted_sight (op); |
299 | expand_lighted_sight (op); |
300 | |
300 | |
301 | |
301 | |
302 | /* clear mark squares */ |
302 | /* clear mark squares */ |
303 | for (x = 0; x < op->contr->ns->mapx; x++) |
303 | for (x = 0; x < op->contr->ns->mapx; x++) |
… | |
… | |
330 | { |
330 | { |
331 | int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1; |
331 | int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1; |
332 | maptile *m = op->map; |
332 | maptile *m = op->map; |
333 | sint16 nx, ny; |
333 | sint16 nx, ny; |
334 | |
334 | |
335 | darklevel = MAP_DARKNESS (m); |
335 | darklevel = m->darkness; |
336 | |
336 | |
337 | /* If the player can see in the dark, lower the darklevel for him */ |
337 | /* If the player can see in the dark, lower the darklevel for him */ |
338 | if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) |
338 | if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) |
339 | darklevel -= 2; |
339 | darklevel -= 2; |
340 | |
340 | |
… | |
… | |
579 | * and then add the players location, which gives |
579 | * and then add the players location, which gives |
580 | * a distance. |
580 | * a distance. |
581 | */ |
581 | */ |
582 | else if (pl->ob->map == map->tile_map[0]) |
582 | else if (pl->ob->map == map->tile_map[0]) |
583 | { |
583 | { |
584 | if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (y + MAP_HEIGHT (map->tile_map[0]) - pl->ob->y) <= pl->ns->mapy / 2)) |
584 | if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (y + map->tile_map[0]->height - pl->ob->y) <= pl->ns->mapy / 2)) |
585 | pl->do_los = 1; |
585 | pl->do_los = 1; |
586 | } |
586 | } |
587 | else if (pl->ob->map == map->tile_map[2]) |
587 | else if (pl->ob->map == map->tile_map[2]) |
588 | { |
588 | { |
589 | if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y + MAP_HEIGHT (map) - y) <= pl->ns->mapy / 2)) |
589 | if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y + map->height - y) <= pl->ns->mapy / 2)) |
590 | pl->do_los = 1; |
590 | pl->do_los = 1; |
591 | } |
591 | } |
592 | else if (pl->ob->map == map->tile_map[1]) |
592 | else if (pl->ob->map == map->tile_map[1]) |
593 | { |
593 | { |
594 | if ((abs (pl->ob->x + MAP_WIDTH (map) - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2)) |
594 | if ((abs (pl->ob->x + map->width - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2)) |
595 | pl->do_los = 1; |
595 | pl->do_los = 1; |
596 | } |
596 | } |
597 | else if (pl->ob->map == map->tile_map[3]) |
597 | else if (pl->ob->map == map->tile_map[3]) |
598 | { |
598 | { |
599 | if ((abs (x + MAP_WIDTH (map->tile_map[3]) - pl->ob->x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2)) |
599 | if ((abs (x + map->tile_map[3]->width - pl->ob->x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2)) |
600 | pl->do_los = 1; |
600 | pl->do_los = 1; |
601 | } |
601 | } |
602 | } |
602 | } |
603 | } |
603 | } |
604 | |
604 | |