[Rails-commits] 18xx/rails/game OperatingRound.java,1.112,1.113

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

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

Modified Files:
	OperatingRound.java 
Log Message:
Suppress forced train buy message for minors

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** OperatingRound.java	3 Mar 2010 21:34:11 -0000	1.112
--- OperatingRound.java	5 Mar 2010 20:49:41 -0000	1.113
***************
*** 49,53 ****
      protected Map<String, Integer> tileLaysPerColour =
              new HashMap<String, Integer>();
- //    protected GenericState<Map<String,Integer>> tileLaysPerColourState = null;
  
      protected List<LayBaseToken> currentNormalTokenLays =
--- 49,52 ----
***************
*** 2344,2348 ****
                      if (canBuyTrainNow) {
                          BuyTrain action = new BuyTrain(train, ipo, cost);
!                         action.setHasNoTrains(!hasTrains); // TEMPORARY
                          possibleActions.add(action);
                      }
--- 2343,2347 ----
                      if (canBuyTrainNow) {
                          BuyTrain action = new BuyTrain(train, ipo, cost);
!                         action.setForcedBuyIfNoRoute(presidentMayHelp); // TEMPORARY
                          possibleActions.add(action);
                      }
***************
*** 2377,2381 ****
                      BuyTrain bt = new BuyTrain(train, ipo, reducedPrice);
                      bt.setSpecialProperty(stb);
!                     bt.setHasNoTrains(!hasTrains); // TEMPORARY
                      possibleActions.add(bt);
                  }
--- 2376,2380 ----
                      BuyTrain bt = new BuyTrain(train, ipo, reducedPrice);
                      bt.setSpecialProperty(stb);
!                     bt.setForcedBuyIfNoRoute(presidentMayHelp); // TEMPORARY
                      possibleActions.add(bt);
                  }
***************
*** 2394,2398 ****
                  if (cost <= cash) {
                      BuyTrain bt = new BuyTrain(train, pool, cost);
!                     bt.setHasNoTrains(!hasTrains); // TEMPORARY
                      possibleActions.add(bt);
                  } else if (costOfCheapestTrain == 0
--- 2393,2397 ----
                  if (cost <= cash) {
                      BuyTrain bt = new BuyTrain(train, pool, cost);
!                     bt.setForcedBuyIfNoRoute(presidentMayHelp); // TEMPORARY
                      possibleActions.add(bt);
                  } else if (costOfCheapestTrain == 0
***************
*** 2407,2411 ****
                          cheapestTrain.getHolder(), costOfCheapestTrain);
                  bt.setPresidentMustAddCash(costOfCheapestTrain - cash);
!                 bt.setHasNoTrains(!hasTrains); // TODO TEMPORARY
                  possibleActions.add(bt);
              }
--- 2406,2410 ----
                          cheapestTrain.getHolder(), costOfCheapestTrain);
                  bt.setPresidentMustAddCash(costOfCheapestTrain - cash);
!                 bt.setForcedBuyIfNoRoute(presidentMayHelp); // TODO TEMPORARY
                  possibleActions.add(bt);
              }