fixed: Display latest stone for ghost dead stone (#401)

Display latest stone for ghost dead stone
featurecat · Nov 3, 2018 · 84d8709 · 84d8709
1 parent a066f38
commit 84d8709
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/featurecat/lizzie/gui/BoardRenderer.java b/src/main/java/featurecat/lizzie/gui/BoardRenderer.java
@@ -385,14 +385,17 @@ private void drawBranch() {
 
     for (int i = 0; i < Board.boardSize; i++) {
       for (int j = 0; j < Board.boardSize; j++) {
-        if (Lizzie.board.getData().stones[Board.getIndex(i, j)] != Stone.EMPTY) continue;
-        if (branch.data.moveNumberList[Board.getIndex(i, j)] > maxBranchMoves()) continue;
+        // Display latest stone for ghost dead stone
+        int index = Board.getIndex(i, j);
+        Stone stone = branch.data.stones[index];
+        boolean isGhost = (stone == Stone.BLACK_GHOST || stone == Stone.WHITE_GHOST);
+        if (Lizzie.board.getData().stones[index] != Stone.EMPTY && !isGhost) continue;
+        if (branch.data.moveNumberList[index] > maxBranchMoves()) continue;
 
         int stoneX = scaledMargin + squareLength * i;
         int stoneY = scaledMargin + squareLength * j;
 
-        drawStone(
-            g, gShadow, stoneX, stoneY, branch.data.stones[Board.getIndex(i, j)].unGhosted(), i, j);
+        drawStone(g, gShadow, stoneX, stoneY, stone.unGhosted(), i, j);
       }
     }