Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19335/rails/game
Modified Files:
OperatingRound.java
Log Message:
Fixed DISCARD_TRAINS step as a GameDef.OrStep value
Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** OperatingRound.java 17 Feb 2010 22:02:47 -0000 1.101
--- OperatingRound.java 17 Feb 2010 22:15:46 -0000 1.102
***************
*** 83,89 ****
GameDef.OrStep.FINAL };
- // side steps
- public static final int STEP_DISCARD_TRAINS = -2;
-
protected boolean doneAllowed = false;
--- 83,86 ----
***************
*** 1575,1579 ****
// Check if any companies must discard trains
if (getCurrentPhase() != previousPhase && checkForExcessTrains()) {
! stepObject.set(STEP_DISCARD_TRAINS);
}
--- 1572,1576 ----
// Check if any companies must discard trains
if (getCurrentPhase() != previousPhase && checkForExcessTrains()) {
! stepObject.set(GameDef.OrStep.DISCARD_TRAINS);
}
|
