[Rails-commits] 18xx/rails/game PublicCompanyI.java, 1.29, 1.30 PublicCompany.java, 1.52, 1.53

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

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

Modified Files:
	PublicCompanyI.java PublicCompany.java 
Log Message:
Added boolean mustTradeTrainsAtFixedPrice (for 1856 CGR)

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** PublicCompany.java	30 Aug 2009 18:15:18 -0000	1.52
--- PublicCompany.java	31 Aug 2009 22:34:01 -0000	1.53
***************
*** 218,221 ****
--- 218,223 ----
      protected boolean mustOwnATrain = true;
  
+     protected boolean mustTradeTrainsAtFixedPrice = false;
+ 
      /** Initial train at floating time */
      protected String initialTrain = null;
***************
*** 464,468 ****
                          = certificateTag.getAttributeAsBoolean("available",
                                  certsAreInitiallyAvailable);
!                 
                  float certificateCount = certificateTag.getAttributeAsFloat("certificateCount", 1.0f);
  
--- 466,470 ----
                          = certificateTag.getAttributeAsBoolean("available",
                                  certsAreInitiallyAvailable);
! 
                  float certificateCount = certificateTag.getAttributeAsFloat("certificateCount", 1.0f);
  
***************
*** 1638,1641 ****
--- 1640,1647 ----
      }
  
+     public boolean mustTradeTrainsAtFixedPrice() {
+     	return mustTradeTrainsAtFixedPrice;
+     }
+ 
      public int getCurrentNumberOfLoans() {
          return currentNumberOfLoans.intValue();
***************
*** 1658,1662 ****
          return maxNumberOfLoans;
      }
!     
      public boolean canLoan() {
          return maxNumberOfLoans > 0;
--- 1664,1668 ----
          return maxNumberOfLoans;
      }
! 
      public boolean canLoan() {
          return maxNumberOfLoans > 0;

Index: PublicCompanyI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompanyI.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** PublicCompanyI.java	28 Aug 2009 20:27:38 -0000	1.29
--- PublicCompanyI.java	31 Aug 2009 22:34:01 -0000	1.30
***************
*** 326,329 ****
--- 326,330 ----
  
      public boolean mustOwnATrain();
+     public boolean mustTradeTrainsAtFixedPrice();
  
      public int getCurrentNumberOfLoans();
***************
*** 336,340 ****
      public int getValuePerLoan();
      public MoneyModel getLoanValueModel ();
!     
      public int sharesOwnedByPlayers();
  }
--- 337,341 ----
      public int getValuePerLoan();
      public MoneyModel getLoanValueModel ();
! 
      public int sharesOwnedByPlayers();
  }