RustyStriker/Klooni1010
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't allow putting pieces after game over

Browse source
This commit is contained in:
Lonami Exo 2017-02-05 16:28:45 +01:00
parent d31991a7af
commit b760fe20cb
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/io/github/lonamiwebs/klooni/game/PieceHolder.java
View file

@ -29,6 +29,7 @@ public class PieceHolder {
// Currently held piece index (picked by the user) // Currently held piece index (picked by the user)
private int heldPiece; private int heldPiece;
public boolean enabled;
// Needed after a piece is dropped, so it can go back // Needed after a piece is dropped, so it can go back
private final Rectangle[] originalPositions; private final Rectangle[] originalPositions;
@ -49,6 +50,7 @@ public class PieceHolder {
//region Constructor //region Constructor
public PieceHolder(final GameLayout layout, final int pieceCount, final float pickedCellSize) { public PieceHolder(final GameLayout layout, final int pieceCount, final float pickedCellSize) {
enabled = true;
count = pieceCount; count = pieceCount;
pieces = new Piece[count]; pieces = new Piece[count];
originalPositions = new Rectangle[count]; originalPositions = new Rectangle[count];
@ -153,7 +155,8 @@ public class PieceHolder {
// returns one of the following: NO_DROP, NORMAL_DROP, ON_BOARD_DROP // returns one of the following: NO_DROP, NORMAL_DROP, ON_BOARD_DROP
public int dropPiece(Board board) { public int dropPiece(Board board) {
if (heldPiece > -1) { if (heldPiece > -1) {
boolean put = board.putScreenPiece(pieces[heldPiece]); boolean put;
put = enabled && board.putScreenPiece(pieces[heldPiece]);
if (put) { if (put) {
if (Klooni.soundsEnabled()) { if (Klooni.soundsEnabled()) {
// The larger the piece size, the smaller the pitch // The larger the piece size, the smaller the pitch

1
core/src/io/github/lonamiwebs/klooni/screens/GameScreen.java
View file

@ -87,6 +87,7 @@ class GameScreen implements Screen, InputProcessor {
} }
private void doGameOver() { private void doGameOver() {
holder.enabled = false;
pauseMenu.show(true); pauseMenu.show(true);
if (Klooni.soundsEnabled()) if (Klooni.soundsEnabled())
gameOverSound.play(); gameOverSound.play();