summaryrefslogtreecommitdiff
path: root/plugins/showmood.cpp
diff options
context:
space:
mode:
authorAlexander Gavrilov2012-03-17 12:52:22 +0400
committerAlexander Gavrilov2012-03-17 12:52:22 +0400
commit58eb199036db3662ec2f7a2d6d301e7f432d5639 (patch)
treec01d46ab4d403cd900ddbf6e0c31c22946c02a7c /plugins/showmood.cpp
parent14d6a62e1d212808623f1a71b3c559ac4a8dada3 (diff)
downloaddfhack-58eb199036db3662ec2f7a2d6d301e7f432d5639.tar.gz
dfhack-58eb199036db3662ec2f7a2d6d301e7f432d5639.tar.bz2
dfhack-58eb199036db3662ec2f7a2d6d301e7f432d5639.tar.xz
Add many new template functions for enums & bitfields.
An incompatible change: ENUM_KEY_STR returns std::string now. The old behavior is available via enum_item_key_str function.
Diffstat (limited to 'plugins/showmood.cpp')
-rw-r--r--plugins/showmood.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/showmood.cpp b/plugins/showmood.cpp
index d47bd8a8..d49477b3 100644
--- a/plugins/showmood.cpp
+++ b/plugins/showmood.cpp
@@ -235,16 +235,16 @@ command_result df_showmood (color_ostream &out, vector <string> & parameters)
else
out.print("%s unknown body parts (%s:%s:%s)",
mat_name.c_str(),
- bitfieldToString(item->flags1).c_str(),
- bitfieldToString(item->flags2).c_str(),
- bitfieldToString(item->flags3).c_str());
+ bitfield_to_string(item->flags1).c_str(),
+ bitfield_to_string(item->flags2).c_str(),
+ bitfield_to_string(item->flags3).c_str());
}
else
out.print("indeterminate %s item (%s:%s:%s)",
mat_name.c_str(),
- bitfieldToString(item->flags1).c_str(),
- bitfieldToString(item->flags2).c_str(),
- bitfieldToString(item->flags3).c_str());
+ bitfield_to_string(item->flags1).c_str(),
+ bitfield_to_string(item->flags2).c_str(),
+ bitfield_to_string(item->flags3).c_str());
break;
default:
{
@@ -252,9 +252,9 @@ command_result df_showmood (color_ostream &out, vector <string> & parameters)
out.print("item %s material %s flags (%s:%s:%s)",
itinfo.toString().c_str(), mat_name.c_str(),
- bitfieldToString(item->flags1).c_str(),
- bitfieldToString(item->flags2).c_str(),
- bitfieldToString(item->flags3).c_str());
+ bitfield_to_string(item->flags1).c_str(),
+ bitfield_to_string(item->flags2).c_str(),
+ bitfield_to_string(item->flags3).c_str());
break;
}
}