[Rails-commits] 18xx/rails/game/specific/_1856 CGRFormationRound.java, 1.7, 1.8 OperatingRound_1856.java, 1.11, 1.12

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

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

Modified Files:
	CGRFormationRound.java OperatingRound_1856.java 
Log Message:
Fixes to CGR formation.
Consistent use of the new Round.finishRound() method.

Index: CGRFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/CGRFormationRound.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CGRFormationRound.java	19 Jul 2009 16:12:24 -0000	1.7
--- CGRFormationRound.java	19 Jul 2009 19:24:21 -0000	1.8
***************
*** 605,609 ****
                  setStep (STEP_EXCHANGE_TOKENS);
              } else {
!                 gameManager.nextRound(this);
              }
          }
--- 605,610 ----
                  setStep (STEP_EXCHANGE_TOKENS);
              } else {
!                 //gameManager.nextRound(this);
!                 finishRound();
              }
          }
***************
*** 623,627 ****
   
              if (checkForTrainsToDiscard()) return true;
!             gameManager.nextRound(this);
          }
  
--- 624,629 ----
   
              if (checkForTrainsToDiscard()) return true;
!             //gameManager.nextRound(this);        
!             finishRound();
          }
  

Index: OperatingRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/OperatingRound_1856.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** OperatingRound_1856.java	17 Jul 2009 21:40:39 -0000	1.11
--- OperatingRound_1856.java	19 Jul 2009 19:24:21 -0000	1.12
***************
*** 440,443 ****
--- 440,444 ----
                  finishOR();
              }
+             wasInterrupted.set(true);
          } else {
              super.resume();