[Rails-commits] 18xx/rails/game/specific/_1856 OperatingRound_1856.java, 1.36, 1.37

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

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

Modified Files:
	OperatingRound_1856.java 
Log Message:
Fixed some bugs with recent rewrite of resetOperatingCompanies().

Index: OperatingRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/OperatingRound_1856.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** OperatingRound_1856.java	15 May 2010 16:36:09 -0000	1.36
--- OperatingRound_1856.java	16 May 2010 21:00:15 -0000	1.37
***************
*** 514,518 ****
              if (cgrCanOperate) {
                  operatingCompanyIndex = Math.max (0, operatingCompanyIndex);
!                 operatingCompanies.add(operatingCompanyIndex, cgr);
                  setOperatingCompany(cgr);
                  message = LocalText.getText("CanOperate", cgr.getName());
--- 514,518 ----
              if (cgrCanOperate) {
                  operatingCompanyIndex = Math.max (0, operatingCompanyIndex);
!                 operatingCompanies.add(operatingCompanyIndex+1, cgr);
                  setOperatingCompany(cgr);
                  message = LocalText.getText("CanOperate", cgr.getName());
***************
*** 523,526 ****
--- 523,527 ----
          } else {
              message = LocalText.getText("DoesNotForm", cgr.getName());
+             roundFinished = !setNextOperatingCompany(false);
          }
          ReportBuffer.add(LocalText.getText("EndOfFormationRound",