[Rails-commits] 18xx/rails/game/specific/_1856 CGRFormationRound.java, 1.3, 1.4

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	CGRFormationRound.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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CGRFormationRound.java	24 May 2009 18:44:40 -0000	1.3
--- CGRFormationRound.java	12 Jul 2009 21:06:18 -0000	1.4
***************
*** 456,460 ****
              if (otherTokens != null) {
                  for (BaseToken token2 : otherTokens) {
!                     if (token2.getCompany() == cgr) {
                          ReportBuffer.add(LocalText.getText("DiscardsBaseToken",
                                  cgrName, token.getCompany().getName(),
--- 456,461 ----
              if (otherTokens != null) {
                  for (BaseToken token2 : otherTokens) {
!                     if (token2.getCompany() == cgr
!                             || nonHomeTokens.contains(token2) && token2 != token) {
                          ReportBuffer.add(LocalText.getText("DiscardsBaseToken",
                                  cgrName, token.getCompany().getName(),