Quent42340/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MouseItemWidget] Small bug fixed.

Browse Source
This commit is contained in:
Quentin Bazin 2018-06-26 06:03:30 +02:00
parent 4f8628c9e5
commit 994cf8433d
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/gui/ItemWidget.cpp
View File

@ -49,7 +49,7 @@ void ItemWidget::draw(RenderTarget &target, RenderStates states) const {
else if (stack().amount() >= 1)
target.draw(m_image, states);
if (stack().item().id() && stack().amount() > 1)
if (stack().amount() != 1)
target.draw(m_text, states);
}

30
source/gui/MouseItemWidget.cpp
View File

@ -38,39 +38,41 @@ void MouseItemWidget::update(const ItemWidget *currentItemWidget) {
}
}
// FIXME
void MouseItemWidget::swapItems(ItemWidget &widget, bool isReadOnly) {
u32 id = widget.stack().item().id();
u32 amount = widget.stack().amount();
if (!isReadOnly || stack().item().id() == 0 || stack().item().id() == id) {
if (stack().item().id() != id) {
u32 widgetItemID = widget.stack().item().id();
u32 widgetItemAmount = widget.stack().amount();
if (!isReadOnly || stack().item().id() == 0 || stack().item().id() == widgetItemID) {
if (stack().item().id() != widgetItemID) {
widget.setStack(stack().item().id(), stack().amount());
setStack(id, amount);
setStack(widgetItemID, widgetItemAmount);
}
else if (!isReadOnly) {
widget.setStack(widget.stack().item().id(), widget.stack().amount() + stack().amount());
widget.setStack(widgetItemID, widgetItemAmount + stack().amount());
setStack(0, 0);
}
else {
setStack(stack().item().id(), stack().amount() + widget.stack().amount());
setStack(stack().item().id(), stack().amount() + widgetItemAmount);
widget.setStack(0, 0);
}
}
}
// FIXME
void MouseItemWidget::putItem(ItemWidget &widget) {
if (!widget.stack().item().id()) {
u32 widgetItemID = widget.stack().item().id();
u32 widgetItemAmount = widget.stack().amount();
if (!widgetItemID && stack().item().id()) {
widget.setStack(stack().item().id(), 1);
setStack(stack().amount() > 1 ? stack().item().id() : 0, stack().amount() - 1);
}
else if (widget.stack().item().id() == stack().item().id()) {
widget.setStack(stack().item().id(), widget.stack().amount() + 1);
else if (widgetItemID && widgetItemID == stack().item().id()) {
widget.setStack(stack().item().id(), widgetItemAmount + 1);
setStack(stack().amount() > 1 ? stack().item().id() : 0, stack().amount() - 1);
}
else if (stack().item().id() == 0) {
setStack(widget.stack().item().id(), ceil(widget.stack().amount() / 2.0));
widget.setStack(widget.stack().amount() > 1 ? widget.stack().item().id() : 0, widget.stack().amount() / 2);
setStack(widgetItemID, ceil(widgetItemAmount / 2.0));
widget.setStack(widgetItemAmount > 1 ? widgetItemID : 0, widgetItemAmount / 2);
}
}