From: Erik V. <ev...@us...> - 2009-12-07 17:50:25
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32659/rails/game Modified Files: StockRound.java Log Message: On the M&H/NYC swap, check if NYC floats. Index: StockRound.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** StockRound.java 27 Nov 2009 20:35:18 -0000 1.52 --- StockRound.java 7 Dec 2009 17:50:16 -0000 1.53 *************** *** 1095,1099 **** false) : pool.findCertificate(publicCompany, false); - //player.buy(cert, 0); cert.moveTo(player.getPortfolio()); ReportBuffer.add(LocalText.getText("SwapsPrivateForCertificate", --- 1095,1098 ---- *************** *** 1105,1108 **** --- 1104,1110 ---- privateCompany.setClosed(); + // Check if the company has floated + if (!publicCompany.hasFloated()) checkFlotation(publicCompany); + return true; } |