diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init index 5847a42c7..3a94aea2a 100644 --- a/data/init/dfhack.keybindings.init +++ b/data/init/dfhack.keybindings.init @@ -25,9 +25,6 @@ keybinding add Ctrl-Shift-K gui/cp437-table # customizable quick command list keybinding add Ctrl-Shift-A gui/quickcmd -# an in-game init file editor -#keybinding add Alt-S@title|dwarfmode/Default|dungeonmode gui/settings-manager - ###################### # dwarfmode bindings # @@ -36,25 +33,21 @@ keybinding add Ctrl-Shift-A gui/quickcmd # quicksave keybinding add Ctrl-Alt-S@dwarfmode quicksave -# toggle the display of water level as 1-7 tiles -#keybinding add Ctrl-W@dwarfmode|dungeonmode twaterlvl - # designate the whole vein for digging -#keybinding add Ctrl-V@dwarfmode digv -#keybinding add Ctrl-Shift-V@dwarfmode "digv x" +keybinding add Ctrl-V@dwarfmode digv +keybinding add Ctrl-Shift-V@dwarfmode "digv x" # clean the selected tile of blood etc -#keybinding add Ctrl-C spotclean +keybinding add Ctrl-C spotclean # destroy the selected item -#keybinding add Ctrl-K@dwarfmode autodump-destroy-item +keybinding add Ctrl-K@dwarfmode autodump-destroy-item # destroy items designated for dump in the selected tile -#keybinding add Ctrl-Shift-K@dwarfmode autodump-destroy-here +keybinding add Ctrl-H@dwarfmode autodump-destroy-here -# apply blueprints to the map (Alt-F for compatibility with LNP Quickfort) +# apply blueprints to the map keybinding add Ctrl-Shift-Q@dwarfmode gui/quickfort -#keybinding add Alt-F@dwarfmode gui/quickfort # show information collected by dwarfmonitor #keybinding add Alt-M@dwarfmode/Default "dwarfmonitor prefs" diff --git a/docs/changelog.txt b/docs/changelog.txt index ea140f451..29fc72cf0 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -40,6 +40,10 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Misc Improvements - `automelt`: is now more resistent to savegame corruption +- `autodump`: reinstate ``autodump-destroy-item``, hotkey: Ctrl-K +- `autodump`: new hotkey for ``autodump-destroy-here``: Ctrl-H +- `dig`: new hotkeys for vein designation on z-level (Ctrl-V) and vein designation across z-levels (Ctrl-Shift-V) +- `clean`: new hotkey for `spotclean`: Ctrl-C ## Documentation diff --git a/plugins/autodump.cpp b/plugins/autodump.cpp index aed6fa0ea..61e83d63e 100644 --- a/plugins/autodump.cpp +++ b/plugins/autodump.cpp @@ -287,13 +287,11 @@ DFhackCExport command_result plugin_init ( color_ostream &out, vector & parame return CR_WRONG_USAGE; } - //DFHack::VersionInfo *mem = Core::getInstance().vinfo; if (!Maps::IsValid()) { out.printerr("Map is not available!\n"); @@ -461,10 +458,11 @@ static int last_frame = 0; command_result df_autodump_destroy_item(color_ostream &out, vector & parameters) { - // HOTKEY COMMAND; CORE ALREADY SUSPENDED if (!parameters.empty()) return CR_WRONG_USAGE; + CoreSuspender suspend; + df::item *item = Gui::getSelectedItem(out); if (!item) return CR_FAILURE;