diff options
| author | Alexander Gavrilov | 2012-03-17 12:52:22 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-03-17 12:52:22 +0400 |
| commit | 58eb199036db3662ec2f7a2d6d301e7f432d5639 (patch) | |
| tree | c01d46ab4d403cd900ddbf6e0c31c22946c02a7c /plugins/feature.cpp | |
| parent | 14d6a62e1d212808623f1a71b3c559ac4a8dada3 (diff) | |
| download | dfhack-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/feature.cpp')
| -rw-r--r-- | plugins/feature.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/feature.cpp b/plugins/feature.cpp index cadd91b6..834284e0 100644 --- a/plugins/feature.cpp +++ b/plugins/feature.cpp @@ -38,7 +38,9 @@ static command_result feature(color_ostream &out, vector <string> ¶meters) df::feature_init *feature_init = world->cur_savegame.map_features[i]; string name; feature_init->getName(&name); - out.print("Feature #%i (\"%s\", type %s) is %s\n", i, name.c_str(), ENUM_KEY_STR(feature_type, feature_init->getType()), feature_init->flags.is_set(feature_init_flags::Discovered) ? "discovered" : "hidden"); + out.print("Feature #%i (\"%s\", type %s) is %s\n", + i, name.c_str(), ENUM_KEY_STR(feature_type, feature_init->getType()).c_str(), + feature_init->flags.is_set(feature_init_flags::Discovered) ? "discovered" : "hidden"); } } else if(cmd == "show") @@ -60,7 +62,8 @@ static command_result feature(color_ostream &out, vector <string> ¶meters) feature_init->flags.set(feature_init_flags::Discovered); string name; feature_init->getName(&name); - out.print("Feature #%i (\"%s\", type %s) is now discovered\n", i, name.c_str(), ENUM_KEY_STR(feature_type, feature_init->getType())); + out.print("Feature #%i (\"%s\", type %s) is now discovered\n", + i, name.c_str(), ENUM_KEY_STR(feature_type, feature_init->getType()).c_str()); } else if(cmd == "hide") { @@ -81,7 +84,8 @@ static command_result feature(color_ostream &out, vector <string> ¶meters) feature_init->flags.clear(feature_init_flags::Discovered); string name; feature_init->getName(&name); - out.print("Feature #%i (\"%s\", type %s) is now hidden\n", i, name.c_str(), ENUM_KEY_STR(feature_type, feature_init->getType())); + out.print("Feature #%i (\"%s\", type %s) is now hidden\n", + i, name.c_str(), ENUM_KEY_STR(feature_type, feature_init->getType()).c_str()); } else return CR_WRONG_USAGE; |
