- ForceAnte should be used if it's non-null (override ante preference)

This commit is contained in:
Sol
2013-05-22 23:14:11 +00:00
parent c0b8c4cf21
commit df1aa55d15

View File

@@ -69,7 +69,7 @@ public class MatchController {
public MatchController(GameType type, Map<LobbyPlayer, PlayerStartConditions> map, Boolean forceAnte) { public MatchController(GameType type, Map<LobbyPlayer, PlayerStartConditions> map, Boolean forceAnte) {
this(type, map); this(type, map);
if( forceAnte != null ) if( forceAnte != null )
this.useAnte |= forceAnte.booleanValue(); this.useAnte = forceAnte.booleanValue();
} }
/** /**
@@ -129,7 +129,7 @@ public class MatchController {
FThreads.invokeInEdtNowOrLater(new Runnable() { @Override public void run() { FThreads.invokeInEdtNowOrLater(new Runnable() { @Override public void run() {
String title = result.isWinner(human) ? "You Win" : "You Lost"; String title = result.getWinner().getName() + " Won!";
ViewWinLose v = new ViewWinLose(MatchController.this); ViewWinLose v = new ViewWinLose(MatchController.this);
v.setTitle(title); v.setTitle(title);
v.setOutcomes(outcomes); v.setOutcomes(outcomes);