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

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

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

Modified Files:
	StockRound_18EU.java 
Log Message:
Fixed missing companies as merge targets

Index: StockRound_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StockRound_18EU.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** StockRound_18EU.java	11 Dec 2008 20:11:15 -0000	1.16
--- StockRound_18EU.java	12 Dec 2008 23:09:53 -0000	1.17
***************
*** 178,182 ****
              if (currentPlayer.maxAllowedNumberOfSharesToBuy(comp,
                      cert.getShare()) < 1) continue;
-             //stockSpace = comp.getCurrentSpace();
              price = comp.getMarketPrice();
  
--- 178,181 ----
***************
*** 236,241 ****
          for (PublicCompanyI comp : comps) {
              type = comp.getTypeName();
!             if (type.equals("Major") && comp.hasStarted()
!                 && !comp.hasOperated()) {
                  targetCompanies.add(comp);
              } else if (type.equals("Minor")
--- 235,239 ----
          for (PublicCompanyI comp : comps) {
              type = comp.getTypeName();
!             if (type.equals("Major") && comp.hasStarted()) {
                  targetCompanies.add(comp);
              } else if (type.equals("Minor")
***************
*** 402,408 ****
  
          // Transfer the President's certificate
-         // currentPlayer.getPortfolio().buyCertificate(cert,
-         // ipo,
-         // cert.getCertificatePrice());
          cert.moveTo(currentPlayer.getPortfolio());
  
--- 400,403 ----
***************
*** 641,645 ****
      protected void finishTurn() {
  
-         // log.debug("+++ FinishTurn");
          if (!discardingTrains.booleanValue()) {
              super.setNextPlayer();
--- 636,639 ----
***************
*** 663,667 ****
      @Override
      protected void finishRound() {
-         // log.debug("+++ FinishRound");
  
          if (discardingTrains.booleanValue()) {
--- 657,660 ----