From: Erik V. <ev...@us...> - 2010-03-05 20:49:53
|
Update of /cvsroot/rails/18xx/rails/game/action In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2824/rails/game/action Modified Files: BuyTrain.java Log Message: Suppress forced train buy message for minors Index: BuyTrain.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** BuyTrain.java 28 Feb 2010 21:38:06 -0000 1.18 --- BuyTrain.java 5 Mar 2010 20:49:41 -0000 1.19 *************** *** 27,31 **** private String fromName; private int fixedCost = 0; ! private boolean hasNoTrains = false; // TODO Remove once route checking exists transient private List<TrainI> trainsForExchange = null; private String[] trainsForExchangeUniqueIds; --- 27,31 ---- private String fromName; private int fixedCost = 0; ! private boolean forcedBuyIfNoRoute = false; // TODO Remove once route checking exists transient private List<TrainI> trainsForExchange = null; private String[] trainsForExchangeUniqueIds; *************** *** 86,91 **** } ! public void setHasNoTrains(boolean hasNoTrains) { ! this.hasNoTrains = hasNoTrains; } --- 86,91 ---- } ! public void setForcedBuyIfNoRoute(boolean hasNoTrains) { ! this.forcedBuyIfNoRoute = hasNoTrains; } *************** *** 164,169 **** } ! public boolean hasNoTrains() { ! return hasNoTrains; } --- 164,169 ---- } ! public boolean isForcedBuyIfNoRoute() { ! return forcedBuyIfNoRoute; } *************** *** 249,253 **** fromName = (String) fields.get("fromName", fromName); fixedCost = fields.get("fixedCost", fixedCost); ! hasNoTrains = fields.get("hasNoTrains", hasNoTrains);//TEMPORARY trainsForExchangeUniqueIds = (String[]) fields.get("trainsForExchangeUniqueIds", trainsForExchangeUniqueIds); forcedExchange = fields.get("forcedExchange", forcedExchange); --- 249,253 ---- fromName = (String) fields.get("fromName", fromName); fixedCost = fields.get("fixedCost", fixedCost); ! forcedBuyIfNoRoute = fields.get("forcedBuyIfNoRoute", forcedBuyIfNoRoute);//TEMPORARY trainsForExchangeUniqueIds = (String[]) fields.get("trainsForExchangeUniqueIds", trainsForExchangeUniqueIds); forcedExchange = fields.get("forcedExchange", forcedExchange); |