From: Erik V. <ev...@us...> - 2010-02-28 21:38:16
|
Update of /cvsroot/rails/18xx/rails/game/action In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7856/rails/game/action Modified Files: BuyTrain.java BuyBonusToken.java MergeCompanies.java Log Message: 1835 Prussian start & side effects Index: BuyBonusToken.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/action/BuyBonusToken.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BuyBonusToken.java 31 Jan 2010 22:22:28 -0000 1.4 --- BuyBonusToken.java 28 Feb 2010 21:38:06 -0000 1.5 *************** *** 41,45 **** this.specialProperty = specialProperty; this.specialPropertyId = specialProperty.getUniqueId(); ! this.privateCompany = specialProperty.getCompany(); this.privateCompanyName = privateCompany.getName(); this.seller = specialProperty.getSeller(); --- 41,45 ---- this.specialProperty = specialProperty; this.specialPropertyId = specialProperty.getUniqueId(); ! this.privateCompany = (PrivateCompanyI) specialProperty.getOriginalCompany(); this.privateCompanyName = privateCompany.getName(); this.seller = specialProperty.getSeller(); Index: BuyTrain.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** BuyTrain.java 31 Jan 2010 22:22:28 -0000 1.17 --- BuyTrain.java 28 Feb 2010 21:38:06 -0000 1.18 *************** *** 216,220 **** } if (specialProperty != null) { ! b.append(" using ").append(specialProperty.getCompany().getName()); } if (isForExchange()) { --- 216,220 ---- } if (specialProperty != null) { ! b.append(" using ").append(specialProperty.getOriginalCompany().getName()); } if (isForExchange()) { Index: MergeCompanies.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/action/MergeCompanies.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MergeCompanies.java 16 Feb 2010 20:16:07 -0000 1.7 --- MergeCompanies.java 28 Feb 2010 21:38:06 -0000 1.8 *************** *** 13,16 **** --- 13,17 ---- import rails.game.*; + import rails.game.action.PossibleAction; /** |