From: Erik V. <ev...@us...> - 2009-11-26 20:14:42
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17273/rails/game Modified Files: OperatingRound.java Log Message: Name change only Index: OperatingRound.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** OperatingRound.java 25 Nov 2009 18:44:17 -0000 1.79 --- OperatingRound.java 26 Nov 2009 20:14:30 -0000 1.80 *************** *** 1306,1310 **** break; } ! // Fixed price must be honoured int fixedPrice = action.getFixedCost(); --- 1306,1310 ---- break; } ! // Fixed price must be honoured int fixedPrice = action.getFixedCost(); *************** *** 1530,1534 **** moveStack.start(true); // ! if (action.isForced()) moveStack.setLinkedToPrevious(); pool.buyTrain(train, 0); --- 1530,1534 ---- moveStack.start(true); // ! if (action.isForced()) moveStack.linkToPreviousMoveSet(); pool.buyTrain(train, 0); *************** *** 2156,2161 **** BuyTrain bt = new BuyTrain(cheapestTrain, cheapestTrain.getHolder(), costOfCheapestTrain); ! bt.setPresidentMustAddCash(costOfCheapestTrain); ! bt.setHasNoTrains(!hasTrains); // TEMPORARY possibleActions.add(bt); } --- 2156,2161 ---- BuyTrain bt = new BuyTrain(cheapestTrain, cheapestTrain.getHolder(), costOfCheapestTrain); ! bt.setPresidentMustAddCash(costOfCheapestTrain - cash); ! bt.setHasNoTrains(!hasTrains); // TODO TEMPORARY possibleActions.add(bt); } |