voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-13 15:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

resolve conflicts 2 (first was not successful for some reason)

Browse source
This commit is contained in:
neveix 2026-08-14 23:55:08 +05:00
parent e7d492e76a
commit 818da085b5
1 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/graphics/ui/elements/InventoryView.cpp
View file

@ -366,7 +366,6 @@ void SlotView::performLeftClick(ItemStack& stack, ItemStack& grabbed) {
); );
return; return;
} }
<<<<<<< HEAD
auto& indices = *content->getIndices(); auto& indices = *content->getIndices();
if (!layout.itemSource && stack.accepts(grabbed) && layout.placing) { if (!layout.itemSource && stack.accepts(grabbed) && layout.placing) {
auto& def = indices.items.require(stack.getItemId()); auto& def = indices.items.require(stack.getItemId());
@ -377,12 +376,6 @@ void SlotView::performLeftClick(ItemStack& stack, ItemStack& grabbed) {
action = InteractionAction::TAKE; action = InteractionAction::TAKE;
std::swap(grabbed, stack); std::swap(grabbed, stack);
} }
=======
auto indices = *content->getIndices();
if (!layout.itemSource && stack.accepts(grabbed) && layout.placing) {
action = InteractionAction::PUT;
stack.move(grabbed, indices);
>>>>>>> main
} else { } else {
actIfCannotPut(stack, grabbed, action); actIfCannotPut(stack, grabbed, action);
} }
@ -399,21 +392,13 @@ void SlotView::performLeftClick(ItemStack& stack, ItemStack& grabbed) {
void SlotView::actIfCannotPut(ItemStack& stack, ItemStack& grabbed, InteractionAction& action) { void SlotView::actIfCannotPut(ItemStack& stack, ItemStack& grabbed, InteractionAction& action) {
const auto& input = gui.getInput(); const auto& input = gui.getInput();
<<<<<<< HEAD
auto& indices = *content->getIndices(); auto& indices = *content->getIndices();
=======
auto indices = *content->getIndices();
>>>>>>> main
if (layout.itemSource) { if (layout.itemSource) {
if (grabbed.isEmpty()) { if (grabbed.isEmpty()) {
action = InteractionAction::TAKE; action = InteractionAction::TAKE;
grabbed.set(stack); grabbed.set(stack);
if (input.pressed(Keycode::LEFT_CONTROL)) { if (input.pressed(Keycode::LEFT_CONTROL)) {
<<<<<<< HEAD
grabbed.maximizeCount(indices); grabbed.maximizeCount(indices);
=======
grabbed.maximizeCount(*content->getIndices());
>>>>>>> main
} }
} else { } else {
if (grabbed.accepts(stack)) { if (grabbed.accepts(stack)) {