Development merge #36

Merged
j23f0779 merged 2 commits from development into dev/model 2024-12-06 10:55:19 +01:00
2 changed files with 7 additions and 5 deletions

2
.gitignore vendored
View File

@@ -1,3 +1,5 @@
.run/
.gradle
build/
#!gradle/wrapper/gradle-wrapper.jar

View File

@@ -88,17 +88,17 @@ public void confirm() {
GameView gameView = (GameView) app.getView();
if(a != null && b != null) {
selectPiece(a);
selectPiece(b);
app.getGameLogic().selectPiece(a);
app.getGameLogic().selectPiece(b);
gameView.getBoardHandler().clearSelectable();
} else if (a != null) {
selectPiece(a);
app.getGameLogic().selectPiece(a);
gameView.getBoardHandler().clearSelectable();
} else {
if(null == card) {
selectCard(null);
app.getGameLogic().selectCard(null);
} else {
selectCard(card);
app.getGameLogic().selectCard(card);
gameView.getGuiHandler().clearSelectableCards();
}
}