[Rails-commits] 18xx/rails/game PrivateCompany.java,1.26,1.27

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

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

Modified Files:
	PrivateCompany.java 
Log Message:
Fixed moving unsold Bridge/Tunnel tokens to GM/Bank

Index: PrivateCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PrivateCompany.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** PrivateCompany.java	4 Nov 2009 20:33:22 -0000	1.26
--- PrivateCompany.java	26 Dec 2009 12:48:02 -0000	1.27
***************
*** 183,191 ****
          ReportBuffer.add(LocalText.getText("PrivateCloses", name));
  
!         // For 1856: buyable tokens move to Bank
          for (SpecialPropertyI sp : specialProperties) {
          	if (sp instanceof SellBonusToken) {
!         		((SellBonusToken)sp).setSeller(GameManager.getInstance().getBank());
!         	}
          }
      }
--- 183,199 ----
          ReportBuffer.add(LocalText.getText("PrivateCloses", name));
  
!         // For 1856: buyable tokens still owned by the private will now
!         // become commonly buyable, i.e. owned by GameManager. 
!         // (Note: all such tokens will be made buyable from the Bank too,
!         // this is done in OperatingRound_1856).
!         List<SellBonusToken> moveToGM = new ArrayList<SellBonusToken>(4);
          for (SpecialPropertyI sp : specialProperties) {
          	if (sp instanceof SellBonusToken) {
!                 moveToGM.add((SellBonusToken)sp);
!             }
!         }
!         for (SellBonusToken sbt : moveToGM) {
!             sbt.moveTo(GameManager.getInstance());
!             log.debug("SP "+sbt.getName()+" is now a common property");
          }
      }