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

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

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

Modified Files:
	CGRFormationRound.java 
Log Message:
Implemented 1856 Bridge and Tunnel tokens

Index: CGRFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/CGRFormationRound.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CGRFormationRound.java	6 Sep 2009 12:27:31 -0000	1.15
--- CGRFormationRound.java	23 Sep 2009 21:38:57 -0000	1.16
***************
*** 483,486 ****
--- 483,488 ----
          City city;
          for (PublicCompanyI comp : mergingCompanies) {
+ 
+         	// Exchange home tokens and collect non-home tokens
              for (TokenI token :comp.getTokens()) {
                  if (token instanceof BaseToken) {
***************
*** 497,503 ****
--- 499,508 ----
              }
  
+             // Move any remaining cash
              if (comp.getCash() > 0) {
                  new CashMove (comp, cgr, comp.getCash());
              }
+ 
+             // Move any remaining trains
              List<TrainI> trains = new ArrayList<TrainI> (comp.getPortfolio().getTrainList());
              for (TrainI train : trains) {
***************
*** 505,508 ****
--- 510,522 ----
                  if (train.getType().isPermanent()) cgr.setHadPermanentTrain(true);
              }
+ 
+             // Move any still valid bonuses
+             if (comp.getBonuses() != null) {
+ 	            List<Bonus> bonuses = new ArrayList<Bonus> (comp.getBonuses());
+ 	            for (Bonus bonus : bonuses) {
+ 	            	cgr.addBonus(new Bonus(cgr, bonus.getName(), bonus.getValue(), bonus.getLocationNameString()));
+ 	            	comp.removeBonus(bonus);
+ 	            }
+             }
          }
  
***************
*** 568,572 ****
          }
  
!        // Close the merged companies
          for (PublicCompanyI comp : mergingCompanies) {
              comp.setClosed();
--- 582,586 ----
          }
  
!         // Close the merged companies
          for (PublicCompanyI comp : mergingCompanies) {
              comp.setClosed();