[Rails-commits] 18xx/rails/game/specific/_1856 CGRFormationRound.java, 1.17, 1.18

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

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

Modified Files:
	CGRFormationRound.java 
Log Message:
Removed statics from StockMarket (no longer a singleton)

Index: CGRFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/CGRFormationRound.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CGRFormationRound.java	25 Sep 2009 19:13:01 -0000	1.17
--- CGRFormationRound.java	25 Sep 2009 19:29:56 -0000	1.18
***************
*** 447,461 ****
              cgr.start(100);
          } else {
-             StockMarketI sm = StockMarket.getInstance();
              int prevColPrice = 100;
              int colPrice;
              StockSpaceI startSpace;
!             for (int col=6; col <= sm.getNumberOfColumns(); col++) {
!                 colPrice = sm.getStockSpace(1, col).getPrice();
                  if (cgrPrice > colPrice) continue;
                  if (cgrPrice - prevColPrice < colPrice - cgrPrice) {
!                     startSpace = sm.getStockSpace(1, col-1);
                  } else {
!                     startSpace = sm.getStockSpace(1, col);
                  }
                  cgr.start(startSpace);
--- 447,460 ----
              cgr.start(100);
          } else {
              int prevColPrice = 100;
              int colPrice;
              StockSpaceI startSpace;
!             for (int col=6; col <= stockMarket.getNumberOfColumns(); col++) {
!                 colPrice = stockMarket.getStockSpace(1, col).getPrice();
                  if (cgrPrice > colPrice) continue;
                  if (cgrPrice - prevColPrice < colPrice - cgrPrice) {
!                     startSpace = stockMarket.getStockSpace(1, col-1);
                  } else {
!                     startSpace = stockMarket.getStockSpace(1, col);
                  }
                  cgr.start(startSpace);