[Rails-commits] 18xx/rails/game/specific/_1835 OperatingRound_1835.java, 1.7, 1.8

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

Update of /cvsroot/rails/18xx/rails/game/specific/_1835
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4573/rails/game/specific/_1835

Modified Files:
	OperatingRound_1835.java 
Log Message:
Honoured option: Minors don't run if BY has not floated 



Index: OperatingRound_1835.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/OperatingRound_1835.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OperatingRound_1835.java	8 May 2010 13:57:31 -0000	1.7
--- OperatingRound_1835.java	8 May 2010 14:33:32 -0000	1.8
***************
*** 53,60 ****
      /** Can a public company operate? (1835 special version) */
      protected boolean canCompanyOperateThisRound (PublicCompanyI company) {
!         return company.hasFloated() && !company.isClosed()
!                 // 1835 special: in some variants minors don't run if BY has not floated
!                 && (!gameManager.getGameOption(GameOption.VARIANT).equalsIgnoreCase("Clemens")
!                         || companyManager.getPublicCompany(GameManager_1835.BY_ID).hasFloated());
      }
  
--- 53,68 ----
      /** Can a public company operate? (1835 special version) */
      protected boolean canCompanyOperateThisRound (PublicCompanyI company) {
!         if (!company.hasFloated() || company.isClosed()) {
!             return false;
!         }
!         // 1835 specials
!         // Majors always operate
!         if (company.hasStockPrice()) return true;
!         // In some variants minors don't run if BY has not floated
!         if (gameManager.getGameOption(GameOption.VARIANT).equalsIgnoreCase("Clemens")
!                 || gameManager.getGameOption("MinorsRequireFloatedBY").equalsIgnoreCase("yes")) {
!             return companyManager.getPublicCompany(GameManager_1835.BY_ID).hasFloated();
!         }
!         return true;
      }