[Rails-commits] 18xx/rails/game/specific/_18EU StockRound_18EU.java, 1.15, 1.16

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

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

Modified Files:
	StockRound_18EU.java 
Log Message:
Bug fix in flotation check when merging a minor

Index: StockRound_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StockRound_18EU.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** StockRound_18EU.java	4 Dec 2008 00:55:27 -0000	1.15
--- StockRound_18EU.java	11 Dec 2008 20:11:15 -0000	1.16
***************
*** 33,37 ****
  		super ();
  	}
! 	
  	/**
  	 * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize
--- 33,37 ----
  		super ();
  	}
! 
  	/**
  	 * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize
***************
*** 43,47 ****
  		super (aGameManager);
  	}
! 	
      @Override
      public void start() {
--- 43,47 ----
  		super (aGameManager);
  	}
! 
      @Override
      public void start() {
***************
*** 67,71 ****
       * Create a list of certificates that a player may buy in a Stock Round,
       * taking all rules into account.
!      * 
       * @return List of buyable certificates.
       */
--- 67,71 ----
       * Create a list of certificates that a player may buy in a Stock Round,
       * taking all rules into account.
!      *
       * @return List of buyable certificates.
       */
***************
*** 266,270 ****
      /**
       * Start a company by buying one or more shares (more applies to e.g. 1841)
!      * 
       * @param player The player that wants to start a company.
       * @param company The company to start.
--- 266,270 ----
      /**
       * Start a company by buying one or more shares (more applies to e.g. 1841)
!      *
       * @param player The player that wants to start a company.
       * @param company The company to start.
***************
*** 478,482 ****
       * closed (in that case, the MergeCompanies.major attribute is null, which
       * never occurs in normal stock rounds).
!      * 
       * @param action
       * @return
--- 478,482 ----
       * closed (in that case, the MergeCompanies.major attribute is null, which
       * never occurs in normal stock rounds).
!      *
       * @param action
       * @return
***************
*** 528,532 ****
  
          if (major != null) {
-             checkFlotation(major);
              if (major.getNumberOfTrains() > major.getCurrentTrainLimit()
                  && !compWithExcessTrains.contains(major)) {
--- 528,531 ----
***************
*** 547,550 ****
--- 546,550 ----
              cert.moveTo(currentPlayer.getPortfolio());
              ReportBuffer.add(LocalText.getText("MinorCloses", minor.getName()));
+             checkFlotation(major);
          } else {
              ReportBuffer.add(LocalText.getText("CLOSE_MINOR_LOG", new String[] {