[Rails-commits] 18xx/rails/game OperatingRound.java,1.47,1.48

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

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

Modified Files:
	OperatingRound.java 
Log Message:
Apply new round initialisation logic

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** OperatingRound.java	4 Dec 2008 00:45:23 -0000	1.47
--- OperatingRound.java	23 Dec 2008 19:56:40 -0000	1.48
***************
*** 113,121 ****
  	 *
       */
!     public OperatingRound() {
! 		super ();
! 	}
! 	
!     public void start(boolean operate, String orNumber) {
  
          if (players == null) {
--- 113,120 ----
  	 *
       */
!     public OperatingRound(GameManagerI gameManager) {
! 		super (gameManager);
! 
!         thisOrNumber = gameManager.getCompositeORNumber();
  
          if (players == null) {
***************
*** 123,126 ****
--- 122,128 ----
              numberOfPlayers = players.size();
          }
+     }
+ 
+     public void start(boolean operate) {
  
          for (PrivateCompanyI priv : companyManager.getAllPrivateCompanies()) {
***************
*** 128,132 ****
          }
  
-         thisOrNumber = orNumber;
          ReportBuffer.add(LocalText.getText("START_OR", thisOrNumber));
  
--- 130,133 ----
***************
*** 136,140 ****
  
              if (operatingCompanyArray.length > 0) {
-                 gameManager.setRound(this);
  
                  if (setNextOperatingCompany(true)) {
--- 137,140 ----
***************
*** 832,837 ****
                  }
  
!                 gameManager.startTreasuryShareTradingRound(this,
!                         operatingCompany);
  
              }
--- 832,836 ----
                  }
  
!                 gameManager.startTreasuryShareTradingRound();
  
              }
***************
*** 1828,1831 ****
--- 1827,1834 ----
      }
  
+     public int getCashToBeRaisedByPresident() {
+         return cashToBeRaisedByPresident;
+     }
+ 
      /**
       * This is currently a stub, as it is unclear if there is a common