[Rails-commits] 18xx/rails/game OperatingRound.java,1.84,1.85

[Erik V. <ev...@us...>]

Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30959/rails/game

Modified Files:
	OperatingRound.java 
Log Message:
Fixed in 1856: 
1. Loop if CGR does not discard any non-permanent train
2. Error if new OR starts immediately after CGR formation.

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** OperatingRound.java	26 Dec 2009 13:44:26 -0000	1.84
--- OperatingRound.java	27 Dec 2009 18:30:11 -0000	1.85
***************
*** 1514,1518 ****
              }
  
!             if (train == null) {
                  errMsg = LocalText.getText("NoTrainSpecified");
                  break;
--- 1514,1518 ----
              }
  
!             if (train == null && action.isForced()) {
                  errMsg = LocalText.getText("NoTrainSpecified");
                  break;
***************
*** 1534,1538 ****
              DisplayBuffer.add(LocalText.getText("CannotDiscardTrain",
                      companyName,
!                     train.getName(),
                      errMsg ));
              return false;
--- 1534,1538 ----
              DisplayBuffer.add(LocalText.getText("CannotDiscardTrain",
                      companyName,
!                     (train != null ?train.getName() : "?"),
                      errMsg ));
              return false;
***************
*** 1555,1559 ****
          }
  
!         setPossibleActions();
  
          return true;
--- 1555,1559 ----
          }
  
!         //setPossibleActions();
  
          return true;