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

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

Update of /cvsroot/rails/18xx/rails/game/specific/_1856
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31079/rails/game/specific/_1856

Modified Files:
	OperatingRound_1856.java 
Log Message:
Added loadTakingAllowed as a Phase property

Index: OperatingRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/OperatingRound_1856.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** OperatingRound_1856.java	28 Aug 2009 20:27:38 -0000	1.13
--- OperatingRound_1856.java	28 Aug 2009 20:49:20 -0000	1.14
***************
*** 290,298 ****
      protected void setGameSpecificPossibleActions() {
          // Take a loan
!         if ((loansThisRound == null
                  || !loansThisRound.containsKey(operatingCompany)
                  || loansThisRound.get(operatingCompany) == 0)
-             && gameManager.getCurrentPhase().getIndex()
-                 <= gameManager.getPhaseManager().getPhaseByName("4").getIndex()
              && operatingCompany.getCurrentNumberOfLoans()
                  < operatingCompany.sharesOwnedByPlayers()) {
--- 290,298 ----
      protected void setGameSpecificPossibleActions() {
          // Take a loan
!         if (currentPhase.isLoanTakingAllowed()
!             && operatingCompany.canLoan()
!             && (loansThisRound == null
                  || !loansThisRound.containsKey(operatingCompany)
                  || loansThisRound.get(operatingCompany) == 0)
              && operatingCompany.getCurrentNumberOfLoans()
                  < operatingCompany.sharesOwnedByPlayers()) {
***************
*** 411,415 ****
          if (step == STEP_REPAY_LOANS) {
  
-             // Are we 
              // Has company any outstanding loans to repay?
              if (operatingCompany.getMaxNumberOfLoans() == 0
--- 411,414 ----