rails-commits

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

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

Modified Files:
	PublicCompany.java 
Log Message:
Alllow negative train cost; subtract train sale amount from seller

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** PublicCompany.java	23 Nov 2009 18:32:45 -0000	1.72
--- PublicCompany.java	26 Nov 2009 20:13:19 -0000	1.73
***************
*** 588,592 ****
          tokensCostThisTurn.setOption(MoneyModel.SUPPRESS_ZERO);
          trainsCostThisTurn = new MoneyModel(name + "_spentOnTrains");
!         trainsCostThisTurn.setOption(MoneyModel.SUPPRESS_ZERO);
          bonusValue = new BonusModel(name + "_bonusValue");
  
--- 588,592 ----
          tokensCostThisTurn.setOption(MoneyModel.SUPPRESS_ZERO);
          trainsCostThisTurn = new MoneyModel(name + "_spentOnTrains");
!         trainsCostThisTurn.setOption(MoneyModel.SUPPRESS_ZERO|MoneyModel.ALLOW_NEGATIVE);
          bonusValue = new BonusModel(name + "_bonusValue");
  
***************
*** 1481,1484 ****
--- 1481,1487 ----
       */
      public void buyTrain(TrainI train, int price) {
+         if (train.getOwner() instanceof PublicCompanyI) {
+         	((MoneyModel)((PublicCompanyI)train.getOwner()).getTrainsSpentThisTurnModel()).add(-price);
+         }
          portfolio.buyTrain(train, price);
          trainsCostThisTurn.add(price);