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

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

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

Modified Files:
	OperatingRound_1835.java 
Log Message:
In the Clemens variant, minors will not 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OperatingRound_1835.java	7 May 2010 20:03:48 -0000	1.6
--- OperatingRound_1835.java	8 May 2010 13:57:31 -0000	1.7
***************
*** 6,9 ****
--- 6,10 ----
  import java.util.List;
  import java.util.Map;
+ import java.util.TreeMap;
  
  import rails.game.Bank;
***************
*** 12,15 ****
--- 13,17 ----
  import rails.game.GameDef;
  import rails.game.GameManagerI;
+ import rails.game.GameOption;
  import rails.game.OperatingRound;
  import rails.game.PhaseI;
***************
*** 20,23 ****
--- 22,26 ----
  import rails.game.PublicCompanyI;
  import rails.game.ReportBuffer;
+ import rails.game.StockSpaceI;
  import rails.game.action.DiscardTrain;
  import rails.game.action.LayTile;
***************
*** 48,51 ****
--- 51,62 ----
      }
  
+     /** 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());
+     }
+ 
      protected void privatesPayOut() {
          int count = 0;