[Rails-commits] 18xx/rails/game/specific/_1856 OperatingRound_1856.java, 1.25, 1.26

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

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

Modified Files:
	OperatingRound_1856.java 
Log Message:
Set seller of unsold Bridge/Tunnel tokens to Bank

Index: OperatingRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/OperatingRound_1856.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** OperatingRound_1856.java	27 Nov 2009 20:35:18 -0000	1.25
--- OperatingRound_1856.java	26 Dec 2009 12:49:58 -0000	1.26
***************
*** 8,11 ****
--- 8,13 ----
  import rails.game.state.BooleanState;
  import rails.game.state.IntegerState;
+ import rails.game.special.SellBonusToken;
+ import rails.game.special.SpecialPropertyI;
  import rails.util.LocalText;
  
***************
*** 361,368 ****
          PhaseI postPhase = currentPhase;
  
!         if (postPhase != prePhase && postPhase.getName().equals("5")) {
!             finalLoanRepaymentPending.set(true);
!             playerToStartLoanRepayment
!                 = gameManager.getPlayerByIndex(action.getPlayerIndex());
          }
  
--- 363,381 ----
          PhaseI postPhase = currentPhase;
  
!         if (postPhase != prePhase) {
!             if (postPhase.getName().equals("5")) {
!                 finalLoanRepaymentPending.set(true);
!                 playerToStartLoanRepayment
!                     = gameManager.getPlayerByIndex(action.getPlayerIndex());
!             } else if (postPhase.getName().equals("4")) {
!                 // Make Bridge and Tunnel tokens buyable from the Bank.
!                 for (SpecialPropertyI sp : gameManager.getCommonSpecialProperties()) {
!                     if (sp instanceof SellBonusToken) {
!                         SellBonusToken sbt = (SellBonusToken)sp;
!                         sbt.setSeller(bank);
!                         log.debug("SP "+sp.getName()+" is now buyable from the Bank");
!                     }
!                 }
!             }
          }