[Rails-commits] 18xx/rails/game StockRound.java, 1.70, 1.71 ShareSellingRound.java, 1.30, 1.31 PublicCompanyI.java, 1.50, 1.51 PublicCompany.java, 1.92, 1.93

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

Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8160/rails/game

Modified Files:
	StockRound.java ShareSellingRound.java PublicCompanyI.java 
	PublicCompany.java 
Log Message:
Fix 1856 share price adjustment if multiple 5% shares are sold in one round.

Index: ShareSellingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/ShareSellingRound.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ShareSellingRound.java	14 Mar 2010 13:10:15 -0000	1.30
--- ShareSellingRound.java	27 Mar 2010 18:27:08 -0000	1.31
***************
*** 357,361 ****
              }
          }
!         company.adjustSharePrice (SOLD, numberSold, gameManager.getStockMarket());
  
          // Check if we still have the presidency
--- 357,362 ----
              }
          }
!         boolean soldBefore = sellPrices.containsKey(companyName);
!         adjustSharePrice (company, numberSold, soldBefore);
  
          // Check if we still have the presidency

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** PublicCompany.java	23 Mar 2010 18:44:58 -0000	1.92
--- PublicCompany.java	27 Mar 2010 18:27:08 -0000	1.93
***************
*** 1081,1093 ****
      }
  
-     public void adjustSharePrice (int actionPerformed, int numberOfSharesSold,
-             StockMarketI stockMarket) {
-         if (actionPerformed == StockRound.SOLD) {
-             if (canSharePriceVary()) {
-                 stockMarket.sell(this, numberOfSharesSold);
-             }
-         }
-     }
- 
      public void updatePlayersWorth() {
  
--- 1081,1084 ----

Index: PublicCompanyI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompanyI.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** PublicCompanyI.java	4 Mar 2010 22:08:09 -0000	1.50
--- PublicCompanyI.java	27 Mar 2010 18:27:08 -0000	1.51
***************
*** 255,261 ****
      public boolean canSharePriceVary();
  
-     public void adjustSharePrice (int actionPerformed, int numberOfSharesSold,
-             StockMarketI stockMarket);
- 
      public void updatePlayersWorth();
  
--- 255,258 ----

Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** StockRound.java	21 Mar 2010 17:43:50 -0000	1.70
--- StockRound.java	27 Mar 2010 18:27:08 -0000	1.71
***************
*** 1089,1093 ****
  
      protected void adjustSharePrice (PublicCompanyI company, int numberSold, boolean soldBefore) {
!         company.adjustSharePrice (SOLD, numberSold, gameManager.getStockMarket());
      }
  
--- 1089,1096 ----
  
      protected void adjustSharePrice (PublicCompanyI company, int numberSold, boolean soldBefore) {
!     
!         if (company.canSharePriceVary()) {
!             stockMarket.sell(company, numberSold);
!         }
      }