diff --git a/library/xml b/library/xml index 8bb7f923b..3e1c72864 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 8bb7f923b1d124610db7e30aeb3be8f4cb9bd021 +Subproject commit 3e1c728640d8f5a9501908064a2d5385a156058c diff --git a/plugins/advtools.cpp b/plugins/advtools.cpp index deaee4856..f88ba6f59 100644 --- a/plugins/advtools.cpp +++ b/plugins/advtools.cpp @@ -55,8 +55,6 @@ DFHACK_PLUGIN("advtools"); DFhackCExport command_result plugin_init (color_ostream &out, std::vector &commands) { - commands.clear(); - if (!ui_advmode) return CR_OK; diff --git a/plugins/changeitem.cpp b/plugins/changeitem.cpp index b3fb2debc..6a300f3b0 100644 --- a/plugins/changeitem.cpp +++ b/plugins/changeitem.cpp @@ -61,7 +61,6 @@ const string changeitem_help = DFhackCExport command_result plugin_init ( color_ostream &out, vector &commands) { - commands.clear(); commands.push_back(PluginCommand( "changeitem", "Change item attributes (material, quality).", df_changeitem, false, @@ -315,7 +314,7 @@ command_result changeitem_execute( out.printerr("change denied: subtype doesn't match. use 'force' to override.\n"); } - item->flags.bits.unk8 = 0; // recalc temperatures next time touched + item->flags.bits.temps_computed = 0; // recalc temperatures next time touched item->flags.bits.weight_computed = 0; // recalc weight next time touched } return CR_OK; diff --git a/plugins/changelayer.cpp b/plugins/changelayer.cpp index 5f7d5cf0e..77b084404 100644 --- a/plugins/changelayer.cpp +++ b/plugins/changelayer.cpp @@ -88,7 +88,6 @@ DFHACK_PLUGIN("changelayer"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { // Fill the command list with your commands. - commands.clear(); commands.push_back(PluginCommand( "changelayer", "Change a whole geology layer.", changelayer, false, /* true means that the command can't be used from non-interactive user interface */ diff --git a/plugins/cursecheck.cpp b/plugins/cursecheck.cpp index 7551fc689..d4005d3d0 100644 --- a/plugins/cursecheck.cpp +++ b/plugins/cursecheck.cpp @@ -57,7 +57,6 @@ DFHACK_PLUGIN("cursecheck"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand("cursecheck", "Checks for cursed creatures (vampires, necromancers, zombies, ...).", cursecheck, false )); diff --git a/plugins/devel/regrass.cpp b/plugins/devel/regrass.cpp index d2d09a517..f4143f465 100644 --- a/plugins/devel/regrass.cpp +++ b/plugins/devel/regrass.cpp @@ -56,7 +56,6 @@ DFHACK_PLUGIN("regrass"); DFhackCExport command_result plugin_init (color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand("regrass", "Regrows all surface grass, restoring outdoor plant growth for pre-0.31.19 worlds.", df_regrass)); return CR_OK; } diff --git a/plugins/feature.cpp b/plugins/feature.cpp index 834284e0f..e2ee9d4f1 100644 --- a/plugins/feature.cpp +++ b/plugins/feature.cpp @@ -96,7 +96,6 @@ DFHACK_PLUGIN("feature"); DFhackCExport command_result plugin_init (color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand( "feature", "List or manage map features.", feature, false, " feature list\n" diff --git a/plugins/liquids.cpp b/plugins/liquids.cpp index 5f4d5b4fe..a7483a886 100644 --- a/plugins/liquids.cpp +++ b/plugins/liquids.cpp @@ -57,7 +57,6 @@ DFHACK_PLUGIN("liquids"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { liquids_hist.load("liquids.history"); - commands.clear(); commands.push_back(PluginCommand( "liquids", "Place magma, water or obsidian.", df_liquids, true)); // interactive, needs console for prompt diff --git a/plugins/mapexport/mapexport.cpp b/plugins/mapexport/mapexport.cpp index c87613fa5..d7d9daea9 100644 --- a/plugins/mapexport/mapexport.cpp +++ b/plugins/mapexport/mapexport.cpp @@ -30,7 +30,6 @@ DFHACK_PLUGIN("mapexport"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { GOOGLE_PROTOBUF_VERIFY_VERSION; - commands.clear(); commands.push_back(PluginCommand("mapexport", "Exports the current map to a file.", mapexport, true)); return CR_OK; } diff --git a/plugins/mode.cpp b/plugins/mode.cpp index 4a4f9fb0a..d87fd5392 100644 --- a/plugins/mode.cpp +++ b/plugins/mode.cpp @@ -18,7 +18,6 @@ DFHACK_PLUGIN("mode"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand( "mode","View, change and track game mode.", mode, true, diff --git a/plugins/plants.cpp b/plugins/plants.cpp index eecbb17bd..09220c653 100644 --- a/plugins/plants.cpp +++ b/plugins/plants.cpp @@ -28,7 +28,6 @@ DFHACK_PLUGIN("plants"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand("grow", "Grows saplings into trees (with active cursor, only the targetted one).", df_grow)); commands.push_back(PluginCommand("immolate", "Set plants on fire (under cursor, 'shrubs', 'trees' or 'all').", df_immolate)); commands.push_back(PluginCommand("extirpate", "Kill plants (same mechanics as immolate).", df_extirpate)); diff --git a/plugins/probe.cpp b/plugins/probe.cpp index aa207518d..c2a82840f 100644 --- a/plugins/probe.cpp +++ b/plugins/probe.cpp @@ -41,7 +41,6 @@ DFHACK_PLUGIN("probe"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand("probe", "A tile probe", df_probe)); diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp index 179fe666f..5afbd2d0a 100644 --- a/plugins/prospector.cpp +++ b/plugins/prospector.cpp @@ -195,7 +195,6 @@ DFHACK_PLUGIN("prospector"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand( "prospect", "Show stats of available raw resources.", prospector, false, diff --git a/plugins/rename.cpp b/plugins/rename.cpp index 2384fbb3b..8dacf62a9 100644 --- a/plugins/rename.cpp +++ b/plugins/rename.cpp @@ -38,7 +38,6 @@ DFHACK_PLUGIN("rename"); DFhackCExport command_result plugin_init (color_ostream &out, std::vector &commands) { - commands.clear(); if (world && ui) { commands.push_back(PluginCommand( "rename", "Rename various things.", rename, false, diff --git a/plugins/reveal.cpp b/plugins/reveal.cpp index 92ae89eb3..39a2ed9cd 100644 --- a/plugins/reveal.cpp +++ b/plugins/reveal.cpp @@ -76,7 +76,6 @@ DFHACK_PLUGIN("reveal"); DFhackCExport command_result plugin_init ( color_ostream &out, vector &commands) { - commands.clear(); commands.push_back(PluginCommand("reveal","Reveal the map. 'reveal hell' will also reveal hell. 'reveal demon' won't pause.",reveal)); commands.push_back(PluginCommand("unreveal","Revert the map to its previous state.",unreveal)); commands.push_back(PluginCommand("revtoggle","Reveal/unreveal depending on state.",revtoggle)); diff --git a/plugins/seedwatch.cpp b/plugins/seedwatch.cpp index f98f9213f..b50eb99d8 100755 --- a/plugins/seedwatch.cpp +++ b/plugins/seedwatch.cpp @@ -243,7 +243,6 @@ DFHACK_PLUGIN("seedwatch"); DFhackCExport command_result plugin_init(color_ostream &out, vector& commands) { - commands.clear(); commands.push_back(PluginCommand("seedwatch", "Switches cookery based on quantity of seeds, to keep reserves", df_seedwatch)); // fill in the abbreviations map, with abbreviations for the standard plants abbreviations["bs"] = "SLIVER_BARB"; diff --git a/plugins/showmood.cpp b/plugins/showmood.cpp index d49477b3f..7407e6af1 100644 --- a/plugins/showmood.cpp +++ b/plugins/showmood.cpp @@ -272,7 +272,6 @@ DFHACK_PLUGIN("showmood"); DFhackCExport command_result plugin_init (color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand("showmood", "Shows items needed for current strange mood.", df_showmood)); return CR_OK; } diff --git a/plugins/skeleton/skeleton.cpp b/plugins/skeleton/skeleton.cpp index 3f5c6cd06..293e43c8d 100644 --- a/plugins/skeleton/skeleton.cpp +++ b/plugins/skeleton/skeleton.cpp @@ -29,7 +29,6 @@ DFHACK_PLUGIN("skeleton"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { // Fill the command list with your commands. - commands.clear(); commands.push_back(PluginCommand( "skeleton", "Do nothing, look pretty.", skeleton, false, /* true means that the command can't be used from non-interactive user interface */ diff --git a/plugins/stockpiles.cpp b/plugins/stockpiles.cpp index 4f3192f3e..0cd5d861d 100644 --- a/plugins/stockpiles.cpp +++ b/plugins/stockpiles.cpp @@ -29,7 +29,6 @@ DFHACK_PLUGIN("stockpiles"); DFhackCExport command_result plugin_init (color_ostream &out, std::vector &commands) { - commands.clear(); if (world && ui) { commands.push_back( PluginCommand( diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp index 32d0ba191..2b2bcf2e7 100644 --- a/plugins/tiletypes.cpp +++ b/plugins/tiletypes.cpp @@ -497,7 +497,6 @@ DFHACK_PLUGIN("tiletypes"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { tiletypes_hist.load("tiletypes.history"); - commands.clear(); commands.push_back(PluginCommand("tiletypes", "Paint map tiles freely, similar to liquids.", df_tiletypes, true)); return CR_OK; } diff --git a/plugins/tubefill.cpp b/plugins/tubefill.cpp index 93b7abff6..0dd045343 100644 --- a/plugins/tubefill.cpp +++ b/plugins/tubefill.cpp @@ -23,7 +23,6 @@ DFHACK_PLUGIN("tubefill"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand("tubefill","Fill in all the adamantine tubes again.",tubefill)); return CR_OK; } diff --git a/plugins/tweak.cpp b/plugins/tweak.cpp index f3369c385..d2fef313b 100644 --- a/plugins/tweak.cpp +++ b/plugins/tweak.cpp @@ -41,7 +41,6 @@ DFHACK_PLUGIN("tweak"); DFhackCExport command_result plugin_init (color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand( "tweak", "Various tweaks for minor bugs.", tweak, false, " tweak clear-missing\n" diff --git a/plugins/vdig.cpp b/plugins/vdig.cpp index 9d96f2fef..607d49387 100644 --- a/plugins/vdig.cpp +++ b/plugins/vdig.cpp @@ -27,7 +27,6 @@ DFHACK_PLUGIN("vdig"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand( "vdig","Dig a whole vein.",vdig,Gui::cursor_hotkey, " Designates a whole vein under the cursor for digging.\n" diff --git a/plugins/versionosd.cpp b/plugins/versionosd.cpp index c7aa0da8b..714649228 100644 --- a/plugins/versionosd.cpp +++ b/plugins/versionosd.cpp @@ -46,7 +46,6 @@ DFTileSurface* createTile(int x, int y) DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand("versionosd", "Toggles displaying version in DF window", df_versionosd)); diff --git a/plugins/weather.cpp b/plugins/weather.cpp index 8bf171748..68eb078ad 100644 --- a/plugins/weather.cpp +++ b/plugins/weather.cpp @@ -19,7 +19,6 @@ DFHACK_PLUGIN("weather"); DFhackCExport command_result plugin_init ( color_ostream &out, std::vector &commands) { - commands.clear(); commands.push_back(PluginCommand( "weather", "Print the weather map or change weather.", weather, false, diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp index 237068b08..fa1d27952 100644 --- a/plugins/workflow.cpp +++ b/plugins/workflow.cpp @@ -59,7 +59,6 @@ DFHACK_PLUGIN("workflow"); DFhackCExport command_result plugin_init (color_ostream &out, std::vector &commands) { - commands.clear(); if (!world || !ui) return CR_FAILURE;