[Rails-commits] 18xx/rails/game OperatingRound.java,1.108,1.109

[Stefan F. <ste...@us...>]

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

Modified Files:
	OperatingRound.java 
Log Message:
Fix of  2954654: Missing default value of doneAllowed in setPossibleActions of OperatingRound.

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** OperatingRound.java	26 Feb 2010 08:04:14 -0000	1.108
--- OperatingRound.java	26 Feb 2010 08:51:08 -0000	1.109
***************
*** 2042,2046 ****
          if (repayment > 0) executeRepayLoans (action);
  
!         doneAllowed = true;
  
          return true;
--- 2042,2047 ----
          if (repayment > 0) executeRepayLoans (action);
  
!         // doneAllowed = true; 
!         // has no effect, overwritten in setPossibleActions(), fix of bug 2954654
  
          return true;
***************
*** 2144,2147 ****
--- 2145,2149 ----
      public boolean setPossibleActions() {
  
+         
          int operatingCompanyIndex = operatingCompanyIndexObject.intValue();
          operatingCompany = operatingCompanyArray[operatingCompanyIndex];
***************
*** 2152,2155 ****
--- 2154,2158 ----
  
          boolean forced = false;
+         doneAllowed = false; // set default (fix of bug  2954654)
          
          if (getStep() == GameDef.OrStep.INITIAL) {