Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Formspec: Don't perform black magic if selected item fits the guess

Browse Source
This commit is contained in:
Kahrl 2013-06-18 01:32:11 +02:00
parent c8ed61b281
commit d74c377337
2 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/guiFormSpecMenu.cpp
View File

@ -912,11 +912,20 @@ void GUIFormSpecMenu::drawMenu()
void GUIFormSpecMenu::updateSelectedItem() void GUIFormSpecMenu::updateSelectedItem()
{ {
// If the selected stack has become empty for some reason, deselect it.
// If the selected stack has become inaccessible, deselect it.
// If the selected stack has become smaller, adjust m_selected_amount.
ItemStack selected = verifySelectedItem();
// WARNING: BLACK MAGIC // WARNING: BLACK MAGIC
// See if there is a stack suited for our current guess. // See if there is a stack suited for our current guess.
// If such stack does not exist, clear the guess. // If such stack does not exist, clear the guess.
if(m_selected_content_guess.name != "") if(m_selected_content_guess.name != "" &&
{ selected.name == m_selected_content_guess.name &&
selected.count == m_selected_content_guess.count){
// Selected item fits the guess. Skip the black magic.
}
else if(m_selected_content_guess.name != ""){
bool found = false; bool found = false;
for(u32 i=0; i<m_inventorylists.size() && !found; i++){ for(u32 i=0; i<m_inventorylists.size() && !found; i++){
const ListDrawSpec &s = m_inventorylists[i]; const ListDrawSpec &s = m_inventorylists[i];
@ -934,23 +943,12 @@ void GUIFormSpecMenu::updateSelectedItem()
if(stack.name == m_selected_content_guess.name && if(stack.name == m_selected_content_guess.name &&
stack.count == m_selected_content_guess.count){ stack.count == m_selected_content_guess.count){
found = true; found = true;
if(m_selected_item){
// If guessed stack is already selected, all is fine
if(m_selected_item->inventoryloc == s.inventoryloc &&
m_selected_item->listname == s.listname &&
m_selected_item->i == (s32)item_i &&
m_selected_amount == stack.count){
break;
}
delete m_selected_item;
m_selected_item = NULL;
}
infostream<<"Client: Changing selected content guess to " infostream<<"Client: Changing selected content guess to "
<<s.inventoryloc.dump()<<" "<<s.listname <<s.inventoryloc.dump()<<" "<<s.listname
<<" "<<item_i<<std::endl; <<" "<<item_i<<std::endl;
delete m_selected_item;
m_selected_item = new ItemSpec(s.inventoryloc, s.listname, item_i); m_selected_item = new ItemSpec(s.inventoryloc, s.listname, item_i);
m_selected_amount = stack.count; m_selected_amount = stack.count;
break;
} }
} }
} }
@ -960,35 +958,6 @@ void GUIFormSpecMenu::updateSelectedItem()
m_selected_content_guess.name = ""; m_selected_content_guess.name = "";
} }
} }
// If the selected stack has become empty for some reason, deselect it.
// If the selected stack has become smaller, adjust m_selected_amount.
if(m_selected_item)
{
bool selection_valid = false;
if(m_selected_item->isValid())
{
Inventory *inv = m_invmgr->getInventory(m_selected_item->inventoryloc);
if(inv)
{
InventoryList *list = inv->getList(m_selected_item->listname);
if(list && (u32) m_selected_item->i < list->getSize())
{
ItemStack stack = list->getItem(m_selected_item->i);
if(m_selected_amount > stack.count)
m_selected_amount = stack.count;
if(!stack.empty())
selection_valid = true;
}
}
}
if(!selection_valid)
{
delete m_selected_item;
m_selected_item = NULL;
m_selected_amount = 0;
m_selected_dragging = false;
}
}
// If craftresult is nonempty and nothing else is selected, select it now. // If craftresult is nonempty and nothing else is selected, select it now.
if(!m_selected_item) if(!m_selected_item)
@ -1017,14 +986,45 @@ void GUIFormSpecMenu::updateSelectedItem()
// If craftresult is selected, keep the whole stack selected // If craftresult is selected, keep the whole stack selected
if(m_selected_item && m_selected_item->listname == "craftresult") if(m_selected_item && m_selected_item->listname == "craftresult")
{ {
Inventory *inv = m_invmgr->getInventory(m_selected_item->inventoryloc); m_selected_amount = verifySelectedItem().count;
assert(inv);
InventoryList *list = inv->getList(m_selected_item->listname);
assert(list);
m_selected_amount = list->getItem(m_selected_item->i).count;
} }
} }
ItemStack GUIFormSpecMenu::verifySelectedItem()
{
// If the selected stack has become empty for some reason, deselect it.
// If the selected stack has become inaccessible, deselect it.
// If the selected stack has become smaller, adjust m_selected_amount.
// Return the selected stack.
if(m_selected_item)
{
if(m_selected_item->isValid())
{
Inventory *inv = m_invmgr->getInventory(m_selected_item->inventoryloc);
if(inv)
{
InventoryList *list = inv->getList(m_selected_item->listname);
if(list && (u32) m_selected_item->i < list->getSize())
{
ItemStack stack = list->getItem(m_selected_item->i);
if(m_selected_amount > stack.count)
m_selected_amount = stack.count;
if(!stack.empty())
return stack;
}
}
}
// selection was not valid
delete m_selected_item;
m_selected_item = NULL;
m_selected_amount = 0;
m_selected_dragging = false;
}
return ItemStack();
}
void GUIFormSpecMenu::acceptInput() void GUIFormSpecMenu::acceptInput()
{ {
if(m_text_dst) if(m_text_dst)

1
src/guiFormSpecMenu.h
View File

@ -186,6 +186,7 @@ public:
void drawSelectedItem(); void drawSelectedItem();
void drawMenu(); void drawMenu();
void updateSelectedItem(); void updateSelectedItem();
ItemStack verifySelectedItem();
void acceptInput(); void acceptInput();
bool OnEvent(const SEvent& event); bool OnEvent(const SEvent& event);