From: Erik V. <ev...@us...> - 2010-01-14 20:56:37
|
Update of /cvsroot/rails/18xx/rails/game/specific/_1856 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5728/rails/game/specific/_1856 Modified Files: OperatingRound_1856.java Log Message: Changes some unnecessary class attributes into local variables Index: OperatingRound_1856.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/OperatingRound_1856.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** OperatingRound_1856.java 27 Dec 2009 18:30:11 -0000 1.27 --- OperatingRound_1856.java 14 Jan 2010 20:56:29 -0000 1.28 *************** *** 3,13 **** import java.util.*; import rails.game.*; import rails.game.action.*; import rails.game.move.CashMove; - import rails.game.state.BooleanState; - import rails.game.state.IntegerState; import rails.game.special.SellBonusToken; import rails.game.special.SpecialPropertyI; import rails.util.LocalText; --- 3,14 ---- import java.util.*; + import rails.common.GuiDef; import rails.game.*; import rails.game.action.*; import rails.game.move.CashMove; import rails.game.special.SellBonusToken; import rails.game.special.SpecialPropertyI; + import rails.game.state.BooleanState; + import rails.game.state.IntegerState; import rails.util.LocalText; *************** *** 16,19 **** --- 17,21 ---- private BooleanState finalLoanRepaymentPending = new BooleanState ("LoanRepaymentPending", false); + private Player playerToStartLoanRepayment = null; *************** *** 58,62 **** } ! operatingCompanyIndex = operatingCompanyIndexObject.intValue(); if (operatingCompanyIndex >= operatingCompanyArray.length) { --- 60,64 ---- } ! int operatingCompanyIndex = operatingCompanyIndexObject.intValue(); if (operatingCompanyIndex >= operatingCompanyArray.length) { *************** *** 190,194 **** if (remainder > presCash) { // Start a share selling round ! cashToBeRaisedByPresident = remainder - presCash; log.info("A share selling round must be started as the president cannot pay $" + remainder + " loan interest"); --- 192,196 ---- if (remainder > presCash) { // Start a share selling round ! int cashToBeRaisedByPresident = remainder - presCash; log.info("A share selling round must be started as the president cannot pay $" + remainder + " loan interest"); *************** *** 306,310 **** protected void setGameSpecificPossibleActions() { // Take a loan ! if (currentPhase.isLoanTakingAllowed() && operatingCompany.canLoan() && (loansThisRound == null --- 308,312 ---- protected void setGameSpecificPossibleActions() { // Take a loan ! if (getCurrentPhase().isLoanTakingAllowed() && operatingCompany.canLoan() && (loansThisRound == null *************** *** 356,364 **** public boolean buyTrain(BuyTrain action) { ! PhaseI prePhase = currentPhase; boolean result = super.buyTrain(action); ! PhaseI postPhase = currentPhase; if (postPhase != prePhase) { --- 358,366 ---- public boolean buyTrain(BuyTrain action) { ! PhaseI prePhase = getCurrentPhase(); boolean result = super.buyTrain(action); ! PhaseI postPhase = getCurrentPhase(); if (postPhase != prePhase) { *************** *** 463,466 **** --- 465,470 ---- // End of CGRFormationRound finalLoanRepaymentPending.set(false); + guiHints.setActivePanel(GuiDef.Panel.MAP); + if (!resetOperatingCompanies(mergingCompanies)) return; if (operatingCompany != null) { *************** *** 510,513 **** --- 514,518 ---- String message; + int operatingCompanyIndex = operatingCompanyIndexObject.intValue(); if (cgr.hasStarted()) { if (cgrCanOperate) { |