neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show in start turn panel if a player has redealed or drawn the last stone

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@570 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-06-22 03:08:37 +02:00
parent 62a55c0a91
commit d6c4da6224
20 changed files with 358 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/jrummikub/control/turn/AbstractTurnControl.java
View file

@ -226,7 +226,7 @@ public abstract class AbstractTurnControl implements ITurnControl {
Set<Stone> tableDiff = tableDifference(turnInfo.getOldTable(),
turnInfo.getTable());
// deal penalty, reset
turnInfo.getRoundState().getGameHeap().putBack(tableDiff);
turnInfo.getRoundState().getStoneHeap().putBack(tableDiff);
turnInfo.getRoundState().getActivePlayer().setLastTurnInvalid(true);
dealPenalty(tableDiff.size());
}
@ -240,7 +240,7 @@ public abstract class AbstractTurnControl implements ITurnControl {
rowCount++;
}
hand.drop(turnInfo.getRoundState().getGameHeap().drawStone(),
hand.drop(turnInfo.getRoundState().getStoneHeap().drawStone(),
new Position(Hand.WIDTH - 1, rowCount - 1));
}