[Rails-commits] 18xx/rails/game/action DiscardTrain.java, 1.10, 1.11

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

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

Modified Files:
	DiscardTrain.java 
Log Message:
Fixed in 1856: 
1. Loop if CGR does not discard any non-permanent train
2. Error if new OR starts immediately after CGR formation.

Index: DiscardTrain.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/DiscardTrain.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DiscardTrain.java	4 Nov 2009 20:33:21 -0000	1.10
--- DiscardTrain.java	27 Dec 2009 18:30:11 -0000	1.11
***************
*** 75,81 ****
              b.append(" ").append(train.getName());
          }
!         b.append(forced ? "," : ", not").append (" forced,");
          if (discardedTrain != null) {
!             b.append(" and discards ").append(discardedTrain.getName());
          }
          return b.toString();
--- 75,83 ----
              b.append(" ").append(train.getName());
          }
!         b.append(forced ? "" : ", not").append (" forced");
          if (discardedTrain != null) {
!             b.append(", discards ").append(discardedTrain.getName());
!         } else if ("".equalsIgnoreCase(getPlayerName())) {
!             b.append(", discards nothing");
          }
          return b.toString();