[Rails-commits] 18xx/rails/game/specific/_18EU OperatingRound_18EU.java, 1.8, 1.9

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

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

Modified Files:
	OperatingRound_18EU.java 
Log Message:
Fixed various bugs

Index: OperatingRound_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/OperatingRound_18EU.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** OperatingRound_18EU.java	9 Oct 2009 19:03:49 -0000	1.8
--- OperatingRound_18EU.java	17 Nov 2009 19:31:27 -0000	1.9
***************
*** 54,58 ****
          boolean atTrainLimit =
                  operatingCompany.getNumberOfTrains() >= operatingCompany.getCurrentTrainLimit();
!         boolean canBuyTrainNow = canBuyTrain();
          boolean presidentMayHelp = operatingCompany.mustOwnATrain();
          TrainI cheapestTrain = null;
--- 54,58 ----
          boolean atTrainLimit =
                  operatingCompany.getNumberOfTrains() >= operatingCompany.getCurrentTrainLimit();
!         boolean canBuyTrainNow = isBelowTrainLimit();
          boolean presidentMayHelp = operatingCompany.mustOwnATrain();
          TrainI cheapestTrain = null;
***************
*** 163,168 ****
      /** In 18EU, a company can (effectively) exchange a Pullmann */
      @Override
!     protected boolean canBuyTrain() {
!         return super.canBuyTrain()
                 || operatingCompany.getPortfolio().getTrainOfType(pullmannType) != null
                 && hasPullmannAtStart.booleanValue();
--- 163,168 ----
      /** In 18EU, a company can (effectively) exchange a Pullmann */
      @Override
!     protected boolean isBelowTrainLimit() {
!         return super.isBelowTrainLimit()
                 || operatingCompany.getPortfolio().getTrainOfType(pullmannType) != null
                 && hasPullmannAtStart.booleanValue();