From: Stefan F. <ste...@us...> - 2010-06-21 22:58:01
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7831/rails/game Modified Files: StartItem.java StartRound_1830.java Log Message: Fixed bug 3017632. And fixed missing unblock of cash for passing player if leave private auction option is selected in 1830 type of startround. Index: StartRound_1830.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/StartRound_1830.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** StartRound_1830.java 20 Apr 2010 19:21:27 -0000 1.32 --- StartRound_1830.java 21 Jun 2010 22:57:53 -0000 1.33 *************** *** 326,329 **** --- 326,330 ---- if (GameOption.OPTION_VALUE_YES.equalsIgnoreCase(getGameOption("LeaveAuctionOnPass"))) { // Game option: player to leave auction after a pass (default no). + player.unblockCash(auctionItem.getBid(player)); auctionItem.setBid(-1, player); } Index: StartItem.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/StartItem.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** StartItem.java 31 Jan 2010 22:22:28 -0000 1.21 --- StartItem.java 21 Jun 2010 22:57:53 -0000 1.22 *************** *** 277,280 **** --- 277,281 ---- * @param amount The bid amount. * @param bidder The bidding player. + * special amounts are 0 for 18EU as buy price, -1 as standard pass, -2 and below as pass in 18EU */ public void setBid(int amount, Player bidder) { *************** *** 290,299 **** bids[index].resetOption(MoneyModel.SUPPRESS_ZERO); bids[index].update(); ! } else { ! // Passed bids[index].set(0); bids[index].update(); } - } --- 291,299 ---- bids[index].resetOption(MoneyModel.SUPPRESS_ZERO); bids[index].update(); ! } else if (amount == -1) { ! // Passed (standard type) bids[index].set(0); bids[index].update(); } } |