[Rails-commits] 18xx/rails/game Round.java,1.39,1.40

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

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

Modified Files:
	Round.java 
Log Message:
In the Clemens variant, minors will not run if BY has not floated

Index: Round.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Round.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Round.java	22 Apr 2010 19:09:58 -0000	1.39
--- Round.java	8 May 2010 13:57:31 -0000	1.40
***************
*** 261,265 ****
          int minorNo = 0;
          for (PublicCompanyI company : companies) {
!             if (!company.hasFloated() || company.isClosed()) continue;
              // Key must put companies in reverse operating order, because sort
              // is ascending.
--- 261,266 ----
          int minorNo = 0;
          for (PublicCompanyI company : companies) {
!             if (!canCompanyOperateThisRound(company)) continue;
!             
              // Key must put companies in reverse operating order, because sort
              // is ascending.
***************
*** 280,283 ****
--- 281,289 ----
      }
  
+     /** Can a public company operate? (Default version) */
+     protected boolean canCompanyOperateThisRound (PublicCompanyI company) {
+         return company.hasFloated() && !company.isClosed();
+     }
+     
      /**
       * Check if a company must be floated, and if so, do it. <p>This method is