Skip to content

Fix gcc errors arising from latest commit (incomplete sight_map implementation) #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keyspace wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix gcc errors arising from latest commit (incomplete sight_map implementation) #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7bdfc9
map: add `const` to `Sight_map::{is_initialised,can_see}()` implement…
Jan 31, 2017
e59f1e9
map: add `build_tile_sight_map()` to header, bandage up its syntax.
Jan 31, 2017
feab6a7
map: fix typo: `may_y` -> `max_y`.
Jan 31, 2017
10b0801
map: minor, tag helper declaration in header as FIXME.
Jan 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,12 @@ void Sight_map::add_point(Tripoint p)
seen.push_back( p );
}

bool Sight_map::is_initialized()
bool Sight_map::is_initialized() const
{
return initialized;
}

bool Sight_map::can_see(Tripoint p)
bool Sight_map::can_see(Tripoint p) const
{
for (int i = 0; i < seen.size(); i++) {
if (seen[i] == p) {
Expand Down Expand Up @@ -2405,8 +2405,8 @@ void Map::build_tile_sight_map(int tile_x, int tile_y, int tile_z, int range)
max_x = SUBMAP_SIZE * MAP_SIZE - 1;
}
int max_y = tile_y + range;
if (may_y > SUBMAP_SIZE * MAP_SIZE - 1) {
may_y = SUBMAP_SIZE * MAP_SIZE - 1;
if (max_y > SUBMAP_SIZE * MAP_SIZE - 1) {
max_y = SUBMAP_SIZE * MAP_SIZE - 1;
}
int max_z = tile_z + range;
if (max_z > VERTICAL_MAP_SIZE * 2) {
Expand All @@ -2416,6 +2416,14 @@ void Map::build_tile_sight_map(int tile_x, int tile_y, int tile_z, int range)
for (int x = min_x; x <= max_x; x++) {
for (int y = min_y; y <= max_y; y++) {
for (int z = min_z; z <= max_z; z++) {
// FIXME: something horrible happened in 8635e2ec3f714a7b6549b70cfadd36e38ef8c6b1
}
// FIXME: something horrible happened in 8635e2ec3f714a7b6549b70cfadd36e38ef8c6b1
}
// FIXME: something horrible happened in 8635e2ec3f714a7b6549b70cfadd36e38ef8c6b1
}
// FIXME: something horrible happened in 8635e2ec3f714a7b6549b70cfadd36e38ef8c6b1
}

/* Still using Cataclysm/DDA style LOS. It sucks and is slow and I hate it.
* Basically, iterate over all Bresenham lines between [x0,y0] and [x1,y1].
Expand Down
2 changes: 2 additions & 0 deletions map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ class Map
// If force_rebuild is false, we skip any tiles for which the Sight_map is
// already initialized.
void build_sight_map(int range = -1, bool force_rebuild = false);
// FIXME: helper, shouldn't de declared here?
void build_tile_sight_map(int tile_x, int tile_y, int tile_z, int range);

bool senses(int x0, int y0, int x1, int y1, int range, Sense_type sense);
bool senses(int x0, int y0, int z0, int x1, int y1, int z1, int range,
Expand Down