MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use automatic return type for index_tile

develop
Pauli 2018-06-18 15:49:27 +03:00
parent ca744139f0
commit 6a151353e3
4 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
library/include/modules/MapCache.h
Unescape Escape View File

@ -127,22 +127,22 @@ public:
/// Arbitrary tag field for flood fills etc. /// Arbitrary tag field for flood fills etc.
int16_t &tag(df::coord2d p) { int16_t &tag(df::coord2d p) {
if (!tags) init_tags(); if (!tags) init_tags();
return index_tile<int16_t&>(tags, p); return index_tile(tags, p);
} }
/// Base layer tile type (i.e. layer stone, veins, feature stone) /// Base layer tile type (i.e. layer stone, veins, feature stone)
df::tiletype baseTiletypeAt(df::coord2d p) df::tiletype baseTiletypeAt(df::coord2d p)
{ {
if (!tiles) init_tiles(); if (!tiles) init_tiles();
return index_tile<df::tiletype>(tiles->base_tiles,p); return index_tile(tiles->base_tiles,p);
} }
/// Base layer material (i.e. layer stone, veins, feature stone) /// Base layer material (i.e. layer stone, veins, feature stone)
t_matpair baseMaterialAt(df::coord2d p) t_matpair baseMaterialAt(df::coord2d p)
{ {
if (!basemats) init_tiles(true); if (!basemats) init_tiles(true);
return t_matpair( return t_matpair(
index_tile<int16_t>(basemats->mat_type,p), index_tile(basemats->mat_type,p),
index_tile<int16_t>(basemats->mat_index,p) index_tile(basemats->mat_index,p)
); );
} }
/// Check if the base layer tile is a vein /// Check if the base layer tile is a vein
@ -164,13 +164,13 @@ public:
int16_t veinMaterialAt(df::coord2d p) int16_t veinMaterialAt(df::coord2d p)
{ {
if (!basemats) init_tiles(true); if (!basemats) init_tiles(true);
return index_tile<int16_t>(basemats->veinmat,p); return index_tile(basemats->veinmat,p);
} }
/// Vein type at pos (even if there is no vein tile) /// Vein type at pos (even if there is no vein tile)
df::inclusion_type veinTypeAt(df::coord2d p) df::inclusion_type veinTypeAt(df::coord2d p)
{ {
if (!basemats) init_tiles(true); if (!basemats) init_tiles(true);
return (df::inclusion_type)index_tile<uint8_t>(basemats->veintype,p); return (df::inclusion_type)index_tile(basemats->veintype,p);
} }
/** Sets the vein material at the specified tile position. /** Sets the vein material at the specified tile position.
@ -207,7 +207,7 @@ public:
{ {
if (!tiles) init_tiles(); if (!tiles) init_tiles();
if (tiles->con_info) if (tiles->con_info)
return index_tile<df::tiletype>(tiles->con_info->tiles,p); return index_tile(tiles->con_info->tiles,p);
return baseTiletypeAt(p); return baseTiletypeAt(p);
} }
/// Static layer material (i.e. base + constructions) /// Static layer material (i.e. base + constructions)
@ -216,8 +216,8 @@ public:
if (!basemats) init_tiles(true); if (!basemats) init_tiles(true);
if (tiles->con_info) if (tiles->con_info)
return t_matpair( return t_matpair(
index_tile<int16_t>(tiles->con_info->mat_type,p), index_tile(tiles->con_info->mat_type,p),
index_tile<int16_t>(tiles->con_info->mat_index,p) index_tile(tiles->con_info->mat_index,p)
); );
return baseMaterialAt(p); return baseMaterialAt(p);
} }
@ -232,45 +232,45 @@ public:
{ {
if (!block) return tiletype::Void; if (!block) return tiletype::Void;
if (tiles) if (tiles)
return index_tile<df::tiletype>(tiles->raw_tiles,p); return index_tile(tiles->raw_tiles,p);
return index_tile<df::tiletype>(block->tiletype,p); return index_tile(block->tiletype,p);
} }
bool setTiletypeAt(df::coord2d, df::tiletype tt, bool force = false); bool setTiletypeAt(df::coord2d, df::tiletype tt, bool force = false);
uint16_t temperature1At(df::coord2d p) uint16_t temperature1At(df::coord2d p)
{ {
return index_tile<uint16_t>(temp1,p); return index_tile(temp1,p);
} }
bool setTemp1At(df::coord2d p, uint16_t temp) bool setTemp1At(df::coord2d p, uint16_t temp)
{ {
if(!valid) return false; if(!valid) return false;
dirty_temperatures = true; dirty_temperatures = true;
index_tile<uint16_t&>(temp1,p) = temp; index_tile(temp1,p) = temp;
return true; return true;
} }
uint16_t temperature2At(df::coord2d p) uint16_t temperature2At(df::coord2d p)
{ {
return index_tile<uint16_t>(temp2,p); return index_tile(temp2,p);
} }
bool setTemp2At(df::coord2d p, uint16_t temp) bool setTemp2At(df::coord2d p, uint16_t temp)
{ {
if(!valid) return false; if(!valid) return false;
dirty_temperatures = true; dirty_temperatures = true;
index_tile<uint16_t&>(temp2,p) = temp; index_tile(temp2,p) = temp;
return true; return true;
} }
df::tile_designation DesignationAt(df::coord2d p) df::tile_designation DesignationAt(df::coord2d p)
{ {
return index_tile<df::tile_designation>(designation,p); return index_tile(designation,p);
} }
bool setDesignationAt(df::coord2d p, df::tile_designation des) bool setDesignationAt(df::coord2d p, df::tile_designation des)
{ {
if(!valid) return false; if(!valid) return false;
dirty_designations = true; dirty_designations = true;
//printf("setting block %d/%d/%d , %d %d\n",x,y,z, p.x, p.y); //printf("setting block %d/%d/%d , %d %d\n",x,y,z, p.x, p.y);
index_tile<df::tile_designation&>(designation,p) = des; index_tile(designation,p) = des;
if(des.bits.dig && block) if(des.bits.dig && block)
block->flags.bits.designated = true; block->flags.bits.designated = true;
return true; return true;
@ -281,21 +281,21 @@ public:
df::tile_occupancy OccupancyAt(df::coord2d p) df::tile_occupancy OccupancyAt(df::coord2d p)
{ {
return index_tile<df::tile_occupancy>(occupancy,p); return index_tile(occupancy,p);
} }
bool setOccupancyAt(df::coord2d p, df::tile_occupancy des) bool setOccupancyAt(df::coord2d p, df::tile_occupancy des)
{ {
if(!valid) return false; if(!valid) return false;
dirty_occupancies = true; dirty_occupancies = true;
index_tile<df::tile_occupancy&>(occupancy,p) = des; index_tile(occupancy,p) = des;
return true; return true;
} }
bool getFlagAt(df::coord2d p, df::tile_designation::Mask mask) { bool getFlagAt(df::coord2d p, df::tile_designation::Mask mask) {
return (index_tile<df::tile_designation&>(designation,p).whole & mask) != 0; return (index_tile(designation,p).whole & mask) != 0;
} }
bool getFlagAt(df::coord2d p, df::tile_occupancy::Mask mask) { bool getFlagAt(df::coord2d p, df::tile_occupancy::Mask mask) {
return (index_tile<df::tile_occupancy&>(occupancy,p).whole & mask) != 0; return (index_tile(occupancy,p).whole & mask) != 0;
} }
bool setFlagAt(df::coord2d p, df::tile_designation::Mask mask, bool set); bool setFlagAt(df::coord2d p, df::tile_designation::Mask mask, bool set);
bool setFlagAt(df::coord2d p, df::tile_occupancy::Mask mask, bool set); bool setFlagAt(df::coord2d p, df::tile_occupancy::Mask mask, bool set);
@ -303,7 +303,7 @@ public:
int itemCountAt(df::coord2d p) int itemCountAt(df::coord2d p)
{ {
if (!item_counts) init_item_counts(); if (!item_counts) init_item_counts();
return index_tile<int>(item_counts,p); return index_tile(item_counts,p);
} }
t_blockflags BlockFlags() t_blockflags BlockFlags()
@ -316,7 +316,7 @@ public:
int biomeIndexAt(df::coord2d p); int biomeIndexAt(df::coord2d p);
int layerIndexAt(df::coord2d p) { int layerIndexAt(df::coord2d p) {
return index_tile<df::tile_designation&>(designation,p).bits.geolayer_index; return index_tile(designation,p).bits.geolayer_index;
} }
df::coord2d biomeRegionAt(df::coord2d p); df::coord2d biomeRegionAt(df::coord2d p);

4
library/include/modules/Maps.h
Unescape Escape View File

@ -167,7 +167,9 @@ typedef uint16_t t_temperatures [16][16];
/** /**
* Index a tile array by a 2D coordinate, clipping it to mod 16 * Index a tile array by a 2D coordinate, clipping it to mod 16
*/ */
template<class R, class T> inline R index_tile(T &v, df::coord2d p) { template<class T> inline auto index_tile(T &v, df::coord2d p)
-> typename std::add_rvalue_reference<decltype(v[0][0])>::type
{
return v[p.x&15][p.y&15]; return v[p.x&15][p.y&15];
} }

18
library/modules/MapCache.cpp
Unescape Escape View File

@ -232,7 +232,7 @@ MapExtras::Block::BasematInfo::BasematInfo()
bool MapExtras::Block::setFlagAt(df::coord2d p, df::tile_designation::Mask mask, bool set) bool MapExtras::Block::setFlagAt(df::coord2d p, df::tile_designation::Mask mask, bool set)
{ {
if(!valid) return false; if(!valid) return false;
auto &val = index_tile<df::tile_designation&>(designation,p); auto &val = index_tile(designation,p);
bool cur = (val.whole & mask) != 0; bool cur = (val.whole & mask) != 0;
if (cur != set) if (cur != set)
{ {
@ -245,7 +245,7 @@ bool MapExtras::Block::setFlagAt(df::coord2d p, df::tile_designation::Mask mask,
bool MapExtras::Block::setFlagAt(df::coord2d p, df::tile_occupancy::Mask mask, bool set) bool MapExtras::Block::setFlagAt(df::coord2d p, df::tile_occupancy::Mask mask, bool set)
{ {
if(!valid) return false; if(!valid) return false;
auto &val = index_tile<df::tile_occupancy&>(occupancy,p); auto &val = index_tile(occupancy,p);
bool cur = (val.whole & mask) != 0; bool cur = (val.whole & mask) != 0;
if (cur != set) if (cur != set)
{ {
@ -1063,7 +1063,7 @@ int MapExtras::Block::biomeIndexAt(df::coord2d p)
if (!block) if (!block)
return -1; return -1;
auto des = index_tile<df::tile_designation>(designation,p); auto des = index_tile(designation,p);
uint8_t idx = des.bits.biome; uint8_t idx = des.bits.biome;
if (idx >= 9) if (idx >= 9)
return -1; return -1;
@ -1141,12 +1141,12 @@ bool MapExtras::Block::addItemOnGround(df::item *item)
if (inserted) if (inserted)
{ {
int &count = index_tile<int&>(item_counts,item->pos); int &count = index_tile(item_counts,item->pos);
if (count++ == 0) if (count++ == 0)
{ {
index_tile<df::tile_occupancy&>(occupancy,item->pos).bits.item = true; index_tile(occupancy,item->pos).bits.item = true;
index_tile<df::tile_occupancy&>(block->occupancy,item->pos).bits.item = true; index_tile(block->occupancy,item->pos).bits.item = true;
} }
} }
@ -1166,13 +1166,13 @@ bool MapExtras::Block::removeItemOnGround(df::item *item)
vector_erase_at(block->items, idx); vector_erase_at(block->items, idx);
int &count = index_tile<int&>(item_counts,item->pos); int &count = index_tile(item_counts,item->pos);
if (--count == 0) if (--count == 0)
{ {
index_tile<df::tile_occupancy&>(occupancy,item->pos).bits.item = false; index_tile(occupancy,item->pos).bits.item = false;
auto &occ = index_tile<df::tile_occupancy&>(block->occupancy,item->pos); auto &occ = index_tile(block->occupancy,item->pos);
occ.bits.item = false; occ.bits.item = false;

14
library/modules/Maps.cpp
Unescape Escape View File

@ -504,7 +504,7 @@ df::coord2d Maps::getBlockTileBiomeRgn(df::map_block *block, df::coord2d pos)
if (!block || !world->world_data) if (!block || !world->world_data)
return df::coord2d(); return df::coord2d();
auto des = index_tile<df::tile_designation>(block->designation,pos); auto des = index_tile(block->designation,pos);
unsigned idx = des.bits.biome; unsigned idx = des.bits.biome;
if (idx < 9) if (idx < 9)
{ {
@ -579,8 +579,8 @@ bool Maps::canWalkBetween(df::coord pos1, df::coord pos2)
if (!block1 || !block2) if (!block1 || !block2)
return false; return false;
auto tile1 = index_tile<uint16_t>(block1->walkable, pos1); auto tile1 = index_tile(block1->walkable, pos1);
auto tile2 = index_tile<uint16_t>(block2->walkable, pos2); auto tile2 = index_tile(block2->walkable, pos2);
return tile1 && tile1 == tile2; return tile1 && tile1 == tile2;
} }
@ -607,7 +607,7 @@ bool Maps::canStepBetween(df::coord pos1, df::coord pos2)
if ( !block1 || !block2 ) if ( !block1 || !block2 )
return false; return false;
if ( !index_tile<uint16_t>(block1->walkable,pos1) || !index_tile<uint16_t>(block2->walkable,pos2) ) { if ( !index_tile(block1->walkable,pos1) || !index_tile(block2->walkable,pos2) ) {
return false; return false;
} }
@ -626,7 +626,7 @@ bool Maps::canStepBetween(df::coord pos1, df::coord pos2)
if ( dx == 0 && dy == 0 ) { if ( dx == 0 && dy == 0 ) {
//check for forbidden hatches and floors and such //check for forbidden hatches and floors and such
df::tile_building_occ upOcc = index_tile<df::tile_occupancy>(block2->occupancy,pos2).bits.building; df::tile_building_occ upOcc = index_tile(block2->occupancy,pos2).bits.building;
if ( upOcc == tile_building_occ::Impassable || upOcc == tile_building_occ::Obstacle || upOcc == tile_building_occ::Floored ) if ( upOcc == tile_building_occ::Impassable || upOcc == tile_building_occ::Obstacle || upOcc == tile_building_occ::Floored )
return false; return false;
@ -659,7 +659,7 @@ bool Maps::canStepBetween(df::coord pos1, df::coord pos2)
return false; //unusable ramp return false; //unusable ramp
//there has to be an unforbidden hatch above the ramp //there has to be an unforbidden hatch above the ramp
if ( index_tile<df::tile_occupancy>(block2->occupancy,pos2).bits.building != tile_building_occ::Dynamic ) if ( index_tile(block2->occupancy,pos2).bits.building != tile_building_occ::Dynamic )
return false; return false;
//note that forbidden hatches have Floored occupancy. unforbidden ones have dynamic occupancy //note that forbidden hatches have Floored occupancy. unforbidden ones have dynamic occupancy
df::building* building = Buildings::findAtTile(pos2); df::building* building = Buildings::findAtTile(pos2);
@ -703,7 +703,7 @@ bool Maps::canStepBetween(df::coord pos1, df::coord pos2)
if ( !blockUp ) if ( !blockUp )
return false; return false;
df::tile_building_occ occupancy = index_tile<df::tile_occupancy>(blockUp->occupancy,up).bits.building; df::tile_building_occ occupancy = index_tile(blockUp->occupancy,up).bits.building;
if ( occupancy == tile_building_occ::Obstacle || occupancy == tile_building_occ::Floored || occupancy == tile_building_occ::Impassable ) if ( occupancy == tile_building_occ::Obstacle || occupancy == tile_building_occ::Floored || occupancy == tile_building_occ::Impassable )
return false; return false;
return true; return true;