From: Erik V. <ev...@us...> - 2010-05-23 08:18:32
|
Update of /cvsroot/rails/18xx/rails/game/specific/_18EU In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23595/rails/game/specific/_18EU Modified Files: OperatingRound_18EU.java Log Message: 18EU bankruptcy rules (Phase 2) Index: OperatingRound_18EU.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/OperatingRound_18EU.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** OperatingRound_18EU.java 15 May 2010 16:36:09 -0000 1.15 --- OperatingRound_18EU.java 23 May 2010 08:18:24 -0000 1.16 *************** *** 127,131 **** // Sort out which players preside over wich companies. for (PublicCompanyI c : operatingCompanies) { ! if (c == operatingCompany) continue; p = c.getPresident(); index = p.getIndex(); --- 127,131 ---- // Sort out which players preside over wich companies. for (PublicCompanyI c : operatingCompanies) { ! if (c == operatingCompany || c.isClosed()) continue; p = c.getPresident(); index = p.getIndex(); *************** *** 237,239 **** --- 237,249 ---- } + @Override + public void resume() { + if (getCurrentPlayer().isBankrupt()) { + // Do not complete the train buying action + savedAction = null; + finishTurn(); + } + super.resume(); + } + } |