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

When searching for tile types, only require candidate tile to match variant or special if it actually has them

develop
Quietust 2012-02-13 20:32:41 -06:00
parent b152a40e83
commit 2ddd3df3a8
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/TileTypes.cpp
Unescape Escape View File

@ -78,8 +78,8 @@ namespace DFHack
break; break;
if (tileShape(tt) == tshape) if (tileShape(tt) == tshape)
{ {
// Special flag match is absolutely mandatory! // Special flag match is mandatory, but only if it might possibly make a difference
if (tileSpecial(tt) != cur_special) if (tileSpecial(tt) != tiletype_special::NONE && cur_special != tiletype_special::NONE && tileSpecial(tt) != cur_special)
continue; continue;
// Special case for constructions. // Special case for constructions.

21
library/include/TileTypes.h
Unescape Escape View File

@ -233,20 +233,27 @@ namespace DFHack
/** /**
* zilpin: Find the first tile entry which matches the given search criteria. * zilpin: Find the first tile entry which matches the given search criteria.
* All parameters are optional. * All parameters are optional.
* To omit, use the 'invalid' enum for that type (e.g. tileclass_invalid, tilematerial_invalid, etc) * To omit, specify NONE for that type
* For tile directions, pass NULL to omit. * For tile directions, pass NULL to omit.
* @return matching index in tileTypeTable, or 0 if none found. * @return matching index in tileTypeTable, or 0 if none found.
*/ */
inline inline
df::tiletype findTileType( const df::tiletype_shape tshape, const df::tiletype_material tmat, const df::tiletype_variant tvar, const df::tiletype_special tspecial, const TileDirection tdir ) df::tiletype findTileType(const df::tiletype_shape tshape, const df::tiletype_material tmat, const df::tiletype_variant tvar, const df::tiletype_special tspecial, const TileDirection tdir)
{ {
FOR_ENUM_ITEMS(tiletype, tt) FOR_ENUM_ITEMS(tiletype, tt)
{ {
if (tshape != tiletype_shape::NONE && tshape != tileShape(tt)) continue; if (tshape != tiletype_shape::NONE && tshape != tileShape(tt))
if (tmat != tiletype_material::NONE && tmat != tileMaterial(tt)) continue; continue;
if (tvar != tiletype_variant::NONE && tvar != tileVariant(tt)) continue; if (tmat != tiletype_material::NONE && tmat != tileMaterial(tt))
if (tspecial != tiletype_special::NONE && tspecial != tileSpecial(tt)) continue; continue;
if (tdir && tdir != tileDirection(tt)) continue; // Don't require variant to match if the destination tile doesn't even have one
if (tvar != tiletype_variant::NONE && tvar != tileVariant(tt) && tileVariant(tt) != tiletype_variant::NONE)
continue;
// Same for special
if (tspecial != tiletype_special::NONE && tspecial != tileSpecial(tt) && tileSpecial(tt) != tiletype_special::NONE)
continue;
if (tdir && tdir != tileDirection(tt))
continue;
// Match! // Match!
return tt; return tt;
} }