[Rails-commits] 18xx/rails/game Round.java, 1.17, 1.18 StockRound.java, 1.36, 1.37 OperatingRound.java, 1.58, 1.59

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

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

Modified Files:
	Round.java StockRound.java OperatingRound.java 
Log Message:
Fixes to CGR formation

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** OperatingRound.java	12 Jul 2009 21:06:18 -0000	1.58
--- OperatingRound.java	14 Jul 2009 20:49:34 -0000	1.59
***************
*** 955,958 ****
--- 955,959 ----
  
      protected void initTurn() {
+         System.out.println("---Starting turn of "+operatingCompany.getName());
          setCurrentPlayer(operatingCompany.getPresident());
          operatingCompany.initTurn();

Index: Round.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Round.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Round.java	4 May 2009 20:29:14 -0000	1.17
--- Round.java	14 Jul 2009 20:49:34 -0000	1.18
***************
*** 319,322 ****
--- 319,327 ----
          }
      }
+     
+     protected void finishRound() {
+         // Inform GameManager
+         gameManager.nextRound(this);
+     }
  
      @Override

Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** StockRound.java	4 May 2009 20:29:14 -0000	1.36
--- StockRound.java	14 Jul 2009 20:49:34 -0000	1.37
***************
*** 1137,1145 ****
      }
  
-     protected void finishRound() {
-         // Inform GameManager
-         gameManager.nextRound(this);
-     }
- 
      /*----- METHODS TO BE CALLED TO SET UP THE NEXT TURN -----*/
  
--- 1137,1140 ----