MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'falconne/plugin_stocks' into update-falconne-plugins

develop
lethosor 2014-11-15 16:34:59 -05:00
parent 61fa2fbda0 dbe903b5b7
commit 4513fa4ab2
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/stocks.cpp
Unescape Escape View File

@ -410,9 +410,6 @@ struct item_grouped_entry
bool canMelt() const bool canMelt() const
{ {
// TODO: Fix melting
return false;
df::item *item = getFirstItem(); df::item *item = getFirstItem();
if (!item) if (!item)
return false; return false;
@ -829,9 +826,6 @@ public:
} }
else if (input->count(interface_key::CUSTOM_SHIFT_M)) else if (input->count(interface_key::CUSTOM_SHIFT_M))
{ {
//TODO: Fix melting
return;
toggleMelt(); toggleMelt();
populateItems(); populateItems();
} }
@ -939,10 +933,7 @@ public:
OutputString(COLOR_BROWN, x, y, (apply_to_all) ? "Listed" : "Selected", true, left_margin); OutputString(COLOR_BROWN, x, y, (apply_to_all) ? "Listed" : "Selected", true, left_margin);
OutputHotkeyString(x, y, "Dump", "Shift-D", true, left_margin); OutputHotkeyString(x, y, "Dump", "Shift-D", true, left_margin);
OutputHotkeyString(x, y, "Forbid", "Shift-F", true, left_margin); OutputHotkeyString(x, y, "Forbid", "Shift-F", true, left_margin);
OutputHotkeyString(x, y, "Melt", "Shift-M", true, left_margin);
//TODO: Fix melting
//OutputHotkeyString(x, y, "Melt", "Shift-M", true, left_margin);
if (depot_info.canTrade()) if (depot_info.canTrade())
OutputHotkeyString(x, y, "Mark for Trade", "Shift-T", true, left_margin); OutputHotkeyString(x, y, "Mark for Trade", "Shift-T", true, left_margin);
@ -1031,9 +1022,6 @@ private:
void toggleMelt() void toggleMelt()
{ {
//TODO: Fix melting
return;
int set_to_melt = -1; int set_to_melt = -1;
auto selected = getSelectedItems(); auto selected = getSelectedItems();
vector<df::item *> items; vector<df::item *> items;