diff options
| author | Alexander Gavrilov | 2012-01-28 16:03:56 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-01-28 16:03:56 +0400 |
| commit | fa4fb4b407b701d707ac3e3a4a0e6804cca2c526 (patch) | |
| tree | da7e5bf1119f33f7678e0a55adacd307788bb65a /plugins/cleaners.cpp | |
| parent | c59f5c16421f62f88697624457b4b390306ca5a5 (diff) | |
| download | dfhack-fa4fb4b407b701d707ac3e3a4a0e6804cca2c526.tar.gz dfhack-fa4fb4b407b701d707ac3e3a4a0e6804cca2c526.tar.bz2 dfhack-fa4fb4b407b701d707ac3e3a4a0e6804cca2c526.tar.xz | |
Modify a number of commands to use CR_WRONG_USAGE for displaying help.
Diffstat (limited to 'plugins/cleaners.cpp')
| -rw-r--r-- | plugins/cleaners.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/plugins/cleaners.cpp b/plugins/cleaners.cpp index 2ba87717..8fb5af93 100644 --- a/plugins/cleaners.cpp +++ b/plugins/cleaners.cpp @@ -148,7 +148,6 @@ DFhackCExport command_result spotclean (Core * c, vector <string> & parameters) DFhackCExport command_result clean (Core * c, vector <string> & parameters) { - bool help = false; bool map = false; bool snow = false; bool mud = false; @@ -168,33 +167,16 @@ DFhackCExport command_result clean (Core * c, vector <string> & parameters) items = true; units = true; } - if(parameters[i] == "snow") + else if(parameters[i] == "snow") snow = true; else if(parameters[i] == "mud") mud = true; - else if(parameters[i] == "help" ||parameters[i] == "?") - { - help = true; - } + else + return CR_WRONG_USAGE; } if(!map && !units && !items) - help = true; - if(help) - { - c->con.print("Removes contaminants from map tiles, items and creatures.\n" - "Options:\n" - "map - clean the map tiles\n" - "items - clean all items\n" - "units - clean all creatures\n" - "all - clean everything.\n" - "More options for 'map':\n" - "snow - also remove snow\n" - "mud - also remove mud\n" - "Example: clean all mud snow\n" - "This removes all spatter, including mud and snow from map tiles.\n" - ); - return CR_OK; - } + return CR_WRONG_USAGE; + CoreSuspender suspend(c); if(map) cleanmap(c,snow,mud); @@ -213,8 +195,26 @@ DFhackCExport const char * plugin_name ( void ) DFhackCExport command_result plugin_init ( Core * c, std::vector <PluginCommand> &commands) { commands.clear(); - commands.push_back(PluginCommand("clean","Removes contaminants from map tiles, items and creatures.",clean)); - commands.push_back(PluginCommand("spotclean","Cleans map tile under cursor.",spotclean,cursor_hotkey)); + commands.push_back(PluginCommand( + "clean","Removes contaminants from map tiles, items and creatures.", + clean, false, + " Removes contaminants from map tiles, items and creatures.\n" + "Options:\n" + " map - clean the map tiles\n" + " items - clean all items\n" + " units - clean all creatures\n" + " all - clean everything.\n" + "More options for 'map':\n" + " snow - also remove snow\n" + " mud - also remove mud\n" + "Example:\n" + " clean all mud snow\n" + " Removes all spatter, including mud and snow from map tiles.\n" + )); + commands.push_back(PluginCommand( + "spotclean","Cleans map tile under cursor.", + spotclean,cursor_hotkey + )); return CR_OK; } |
