[Rails-commits] 18xx/rails/game StockRound.java, 1.74, 1.75 GameManager.java, 1.105, 1.106

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

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

Modified Files:
	StockRound.java GameManager.java 
Log Message:
1835: fixed train discarding by PR at end of any PR formation round.

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** GameManager.java	30 May 2010 17:03:30 -0000	1.105
--- GameManager.java	15 Jun 2010 20:16:54 -0000	1.106
***************
*** 897,901 ****
  
              try {
!                 log.debug("Action: " + action);
                  if (!processCorrectionActions(action) && !getCurrentRound().process(action)) {
                      String msg = "Player "+action.getPlayerName()+"\'s action \""
--- 897,901 ----
  
              try {
!                 log.debug("Action ("+action.getPlayerName()+"): " + action);
                  if (!processCorrectionActions(action) && !getCurrentRound().process(action)) {
                      String msg = "Player "+action.getPlayerName()+"\'s action \""
***************
*** 917,920 ****
--- 917,922 ----
                      "ExecutedActions");
              if (moveStack.isOpen()) moveStack.finish();
+             
+             log.debug("Turn: "+getCurrentPlayer().getName());
          }
  

Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** StockRound.java	25 May 2010 20:27:17 -0000	1.74
--- StockRound.java	15 Jun 2010 20:16:54 -0000	1.75
***************
*** 490,493 ****
--- 490,494 ----
      }
  
+     // Return value indicates whether the action has been processed.
      protected boolean processGameSpecificAction(PossibleAction action) {