[Rails-commits] 18xx/rails/game/specific/_1856 CGRFormationRound.java, 1.5, 1.6 OperatingRound_1856.java, 1.10, 1.11

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

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

Modified Files:
	CGRFormationRound.java OperatingRound_1856.java 
Log Message:
Fixes to CGR formation

Index: CGRFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/CGRFormationRound.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CGRFormationRound.java	14 Jul 2009 20:49:33 -0000	1.5
--- CGRFormationRound.java	17 Jul 2009 21:40:39 -0000	1.6
***************
*** 81,88 ****
          setCurrentPlayer (startingPlayer);
  
!         if (!setNextCompanyNeedingPresidentIntervention()) {
!             finishRound();
!             return;
!         }
      }
      
--- 81,85 ----
          setCurrentPlayer (startingPlayer);
  
!         process (null);
      }
      
***************
*** 587,591 ****
      public boolean process (PossibleAction action) {
          
!         boolean result = false;
          
          if (action instanceof RepayLoans) {
--- 584,588 ----
      public boolean process (PossibleAction action) {
          
!         boolean result = true;
          
          if (action instanceof RepayLoans) {

Index: OperatingRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/OperatingRound_1856.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** OperatingRound_1856.java	14 Jul 2009 20:49:33 -0000	1.10
--- OperatingRound_1856.java	17 Jul 2009 21:40:39 -0000	1.11
***************
*** 464,468 ****
              if (company.isClosed()) {
                  if (index <= lastOperatingCompanyIndex) cgrCanOperate = false;
!                 it.remove();
              }
          }
--- 464,468 ----
              if (company.isClosed()) {
                  if (index <= lastOperatingCompanyIndex) cgrCanOperate = false;
!                 //it.remove();
              }
          }