summaryrefslogtreecommitdiff
path: root/plugins/tiletypes.cpp
diff options
context:
space:
mode:
authorAlexander Gavrilov2012-03-15 20:46:08 +0400
committerAlexander Gavrilov2012-03-15 20:46:08 +0400
commitf84b1539a8ebd7267acc06fbe2f4dd2394fccce9 (patch)
treec5b02295686b5475bd4263dd1920d78401fa9dcf /plugins/tiletypes.cpp
parente5efbc589525d34c5205065514f82a054a92a128 (diff)
downloaddfhack-f84b1539a8ebd7267acc06fbe2f4dd2394fccce9.tar.gz
dfhack-f84b1539a8ebd7267acc06fbe2f4dd2394fccce9.tar.bz2
dfhack-f84b1539a8ebd7267acc06fbe2f4dd2394fccce9.tar.xz
Change to the traits representation of enum and bitfield properties.
Diffstat (limited to 'plugins/tiletypes.cpp')
-rw-r--r--plugins/tiletypes.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp
index 8825d811..d704f030 100644
--- a/plugins/tiletypes.cpp
+++ b/plugins/tiletypes.cpp
@@ -233,7 +233,7 @@ bool processTileType(TileType &paint, const std::string &option, const std::stri
if (option == "shape" || option == "sh" || option == "s")
{
- if (tiletype_shape::is_valid((df::tiletype_shape)valInt))
+ if (is_valid_enum_item((df::tiletype_shape)valInt))
{
paint.shape = (df::tiletype_shape)valInt;
found = true;
@@ -258,7 +258,7 @@ bool processTileType(TileType &paint, const std::string &option, const std::stri
}
else if (option == "material" || option == "mat" || option == "m")
{
- if (tiletype_material::is_valid((df::tiletype_material)valInt))
+ if (is_valid_enum_item((df::tiletype_material)valInt))
{
paint.material = (df::tiletype_material)valInt;
found = true;
@@ -283,7 +283,7 @@ bool processTileType(TileType &paint, const std::string &option, const std::stri
}
else if (option == "special" || option == "sp")
{
- if (tiletype_special::is_valid((df::tiletype_special)valInt))
+ if (is_valid_enum_item((df::tiletype_special)valInt))
{
paint.special = (df::tiletype_special)valInt;
found = true;
@@ -308,7 +308,7 @@ bool processTileType(TileType &paint, const std::string &option, const std::stri
}
else if (option == "variant" || option == "var" || option == "v")
{
- if (tiletype_variant::is_valid((df::tiletype_variant)valInt))
+ if (is_valid_enum_item((df::tiletype_variant)valInt))
{
paint.variant = (df::tiletype_variant)valInt;
found = true;