Update of /cvsroot/rails/18xx/rails/game/action
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14051/rails/game/action
Modified Files:
BuyTrain.java
Log Message:
Fixed missing deserialization statements. These cause all train prices becoming $0 on a reload
Index: BuyTrain.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** BuyTrain.java 20 Nov 2009 20:56:51 -0000 1.12
--- BuyTrain.java 25 Nov 2009 18:45:28 -0000 1.13
***************
*** 30,33 ****
--- 30,34 ----
transient private List<TrainI> trainsForExchange = null;
private String[] trainsForExchangeUniqueIds;
+ private boolean forcedExchange = false;
private boolean presidentMustAddCash = false;
private boolean presidentMayAddCash = false;
***************
*** 42,46 ****
transient private TrainI exchangedTrain = null;
private String exchangedTrainUniqueId;
- private boolean forcedExchange = false;
public static final long serialVersionUID = 2L;
--- 43,46 ----
***************
*** 60,64 ****
trainsForExchangeUniqueIds = new String[trains.size()];
for (int i = 0; i < trains.size(); i++) {
! trainsForExchangeUniqueIds[i] = trains.get(i).getName(); // TODO:
// Must
// be
--- 60,65 ----
trainsForExchangeUniqueIds = new String[trains.size()];
for (int i = 0; i < trains.size(); i++) {
! trainsForExchangeUniqueIds[i] = trains.get(i).getName();
! // TODO:
// Must
// be
***************
*** 183,191 ****
this.exchangedTrain = exchangedTrain;
if (exchangedTrain != null)
! this.exchangedTrainUniqueId = exchangedTrain.getName();// TODO:
! // Must be
! // replaced
! // by unique
! // Id
}
--- 184,188 ----
this.exchangedTrain = exchangedTrain;
if (exchangedTrain != null)
! this.exchangedTrainUniqueId = exchangedTrain.getName();
}
***************
*** 201,204 ****
--- 198,202 ----
} else {
b.append(" for any amount");
+ if (pricePaid > 0) b.append(" - paid: ").append(Bank.format(pricePaid));
}
if (specialProperty != null) {
***************
*** 213,216 ****
--- 211,215 ----
b.append(" may add cash up to ").append(
Bank.format(presidentCashToAdd));
+ if (pricePaid > 0) b.append(" - paid: ").append(Bank.format(pricePaid));
return b.toString();
***************
*** 239,245 ****
--- 238,249 ----
hasNoTrains = fields.get("hasNoTrains", hasNoTrains);//TEMPORARY
trainsForExchangeUniqueIds = (String[]) fields.get("trainsForExchangeUniqueIds", trainsForExchangeUniqueIds);
+ forcedExchange = fields.get("forcedExchange", forcedExchange);
presidentMustAddCash = fields.get("presidentMustAddCash", presidentMustAddCash);
presidentMayAddCash = fields.get("presidentMayAddCash", presidentMayAddCash);
presidentCashToAdd = fields.get("presidentCashToAdd", presidentCashToAdd);
+ specialPropertyId = fields.get("specialPropertyId", specialPropertyId);
+ pricePaid = fields.get("pricePaid", pricePaid);
+ addedCash = fields.get("addedCash", addedCash);
+ exchangedTrainUniqueId = (String) fields.get("exchangedTrainUniqueId", exchangedTrainUniqueId);
GameManagerI gameManager = GameManager.getInstance();
|
