debug output hidden under a "private final static boolean"

This commit is contained in:
Maxmtg
2013-05-28 13:09:24 +00:00
parent 6ba681719f
commit 2ce74d2742

View File

@@ -716,14 +716,17 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
return (this.nUpkeepsThisTurn == 1); return (this.nUpkeepsThisTurn == 1);
} }
/** private final static boolean DEBUG_PHASES = false;
* <p>
* passPriority. public void startFirstTurn(Player goesFirst) {
* </p>
*/
public final void passPriority() {
FThreads.assertExecutedByEdt(false); FThreads.assertExecutedByEdt(false);
StopWatch sw = new StopWatch(); StopWatch sw = new StopWatch();
if(phase != null)
throw new IllegalStateException("Turns already started, call this only once per game");
setPlayerTurn(goesFirst);
advancePhase();
pPlayerPriority.getController().takePriority();
// This is main game loop. It will hang waiting for player's input. // This is main game loop. It will hang waiting for player's input.
while (!game.isGameOver()) { // stop game if it's outcome is clear. while (!game.isGameOver()) { // stop game if it's outcome is clear.
@@ -764,31 +767,27 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
if ( phase == PhaseType.COMBAT_DECLARE_ATTACKERS && playerTurn != pPlayerPriority ) if ( phase == PhaseType.COMBAT_DECLARE_ATTACKERS && playerTurn != pPlayerPriority )
givePriority = false; givePriority = false;
System.out.print(FThreads.prependThreadId(debugPrintState(givePriority))); if( DEBUG_PHASES )
System.out.print(FThreads.prependThreadId(debugPrintState(givePriority)));
if( givePriority ) { if( givePriority ) {
sw.start(); if( DEBUG_PHASES )
sw.start();
pPlayerPriority.getController().takePriority(); pPlayerPriority.getController().takePriority();
sw.stop(); if( DEBUG_PHASES ) {
System.out.print("... passed in " + sw.getTime()/1000f + " ms\n"); sw.stop();
sw.reset(); System.out.print("... passed in " + sw.getTime()/1000f + " ms\n");
} else { sw.reset();
}
} else if( DEBUG_PHASES ){
System.out.print(" >>\n"); System.out.print(" >>\n");
} }
} }
} }
public void startFirstTurn(Player goesFirst) {
if(phase != null)
throw new IllegalStateException("Turns already started, call this only once per game");
setPlayerTurn(goesFirst);
advancePhase();
pPlayerPriority.getController().takePriority();
passPriority();
}
private void advancePhase() { // may be called externally only from gameAction after mulligans private void advancePhase() { // may be called externally only from gameAction after mulligans