BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Merge remote-tracking branch 'queatz/mmb10'

Browse Source
This commit is contained in:
Perttu Ahola 2011-08-30 14:24:23 +03:00
commit ba0322f353
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/guiInventoryMenu.cpp
View File

@ -309,10 +309,17 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event)
} }
if(event.EventType==EET_MOUSE_INPUT_EVENT) if(event.EventType==EET_MOUSE_INPUT_EVENT)
{ {
if(event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN char amount = -1;
|| event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN)
if(event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
amount = 0;
else if(event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN)
amount = 1;
else if(event.MouseInput.Event == EMIE_MMOUSE_PRESSED_DOWN)
amount = 10;
if(amount >= 0)
{ {
bool right = (event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN);
v2s32 p(event.MouseInput.X, event.MouseInput.Y); v2s32 p(event.MouseInput.X, event.MouseInput.Y);
//dstream<<"Mouse down at p=("<<p.X<<","<<p.Y<<")"<<std::endl; //dstream<<"Mouse down at p=("<<p.X<<","<<p.Y<<")"<<std::endl;
ItemSpec s = getItemAtPos(p); ItemSpec s = getItemAtPos(p);
@ -343,7 +350,7 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event)
{ {
dstream<<"Handing IACTION_MOVE to manager"<<std::endl; dstream<<"Handing IACTION_MOVE to manager"<<std::endl;
IMoveAction *a = new IMoveAction(); IMoveAction *a = new IMoveAction();
a->count = right ? 1 : 0; a->count = amount;
a->from_inv = m_selected_item->inventoryname; a->from_inv = m_selected_item->inventoryname;
a->from_list = m_selected_item->listname; a->from_list = m_selected_item->listname;
a->from_i = m_selected_item->i; a->from_i = m_selected_item->i;
@ -358,7 +365,7 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event)
} }
// Remove selection if target was left-clicked or source // Remove selection if target was left-clicked or source
// slot was emptied // slot was emptied
if(right == false || source_empties) if(amount == 0 || source_empties)
{ {
delete m_selected_item; delete m_selected_item;
m_selected_item = NULL; m_selected_item = NULL;