Development merge #36
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,3 +1,5 @@
|
||||
|
||||
.run/
|
||||
.gradle
|
||||
build/
|
||||
#!gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user