fix: check that cards are different colors instead of different ranks
parent
d6a1438f98
commit
57a09e8830
|
@ -533,7 +533,7 @@ pub fn doSelectOrPlace(pressed: bool) !void {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hovered.items[hovered.items.len - 1].rank - 1 != selected_substack[0].rank or
|
if (hovered.items[hovered.items.len - 1].rank - 1 != selected_substack[0].rank or
|
||||||
hovered.items[hovered.items.len - 1].suit == selected_substack[0].suit)
|
hovered.items[hovered.items.len - 1].suit.color() == selected_substack[0].suit.color())
|
||||||
{
|
{
|
||||||
break :move_from_selected_to_hovered;
|
break :move_from_selected_to_hovered;
|
||||||
}
|
}
|
||||||
|
@ -541,7 +541,7 @@ pub fn doSelectOrPlace(pressed: bool) !void {
|
||||||
hovered.appendSliceAssumeCapacity(selected_substack);
|
hovered.appendSliceAssumeCapacity(selected_substack);
|
||||||
selected.shrinkRetainingCapacity(selected.items.len - selected_substack.len);
|
selected.shrinkRetainingCapacity(selected.items.len - selected_substack.len);
|
||||||
hovered_card = indexOfTopOfStack(hovered_deck.?.items);
|
hovered_card = indexOfTopOfStack(hovered_deck.?.items);
|
||||||
try history.append(gpa, snapshot);
|
cards_moved = true;
|
||||||
}
|
}
|
||||||
if (cards_moved) {
|
if (cards_moved) {
|
||||||
try history.append(gpa, snapshot);
|
try history.append(gpa, snapshot);
|
||||||
|
|
Loading…
Reference in New Issue