Update of /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1856
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30779/rails/ui/swing/gamespecific/_1856
Modified Files:
StatusWindow_1856.java
Log Message:
1835: fixed train discarding by PR at end of any PR formation round.
Index: StatusWindow_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StatusWindow_1856.java 31 Jan 2010 22:22:34 -0000 1.6
--- StatusWindow_1856.java 15 Jun 2010 20:16:54 -0000 1.7
***************
*** 27,32 ****
//repayLoans (action);
immediateAction = possibleActions.getType(RepayLoans.class).get(0);
! } else if (possibleActions.contains(DiscardTrain.class)) {
! immediateAction = possibleActions.getType(DiscardTrain.class).get(0);
} else if (possibleActions.contains(ExchangeTokens.class)) {
immediateAction = possibleActions.getType(ExchangeTokens.class).get(0);
--- 27,33 ----
//repayLoans (action);
immediateAction = possibleActions.getType(RepayLoans.class).get(0);
! // Moved up
! //} else if (possibleActions.contains(DiscardTrain.class)) {
! // immediateAction = possibleActions.getType(DiscardTrain.class).get(0);
} else if (possibleActions.contains(ExchangeTokens.class)) {
immediateAction = possibleActions.getType(ExchangeTokens.class).get(0);
***************
*** 47,50 ****
--- 48,53 ----
repayLoans (nextAction);
return true;
+
+ /* Moved up
} else if (immediateAction instanceof DiscardTrain) {
// Make a local copy and discard the original,
***************
*** 54,57 ****
--- 57,61 ----
gameUIManager.discardTrains (nextAction);
return true;
+ */
} else if (immediateAction instanceof ExchangeTokens) {
// Make a local copy and discard the original,
|
