Update of /cvsroot/rails/18xx/rails/ui/swing
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3623/rails/ui/swing
Modified Files:
ORUIManager.java
Log Message:
Fixed company turn change issue
Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** ORUIManager.java 11 Jan 2010 23:06:14 -0000 1.44
--- ORUIManager.java 14 Jan 2010 20:46:59 -0000 1.45
***************
*** 109,114 ****
public void finish() {
orWindow.finish();
! orWindow.setVisible(false);
!
}
--- 109,115 ----
public void finish() {
orWindow.finish();
! if (!(gameUIManager.getCurrentRound() instanceof ShareSellingRound)) {
! setORCompanyTurn(-1);
! }
}
***************
*** 1138,1142 ****
orStep = oRound.getStep();
orComp = oRound.getOperatingCompany();
! log.debug("Or comp index = " + orCompIndex);
log.debug("OR company = " + orComp.getName());
log.debug("OR step=" + orStep + " "
--- 1139,1143 ----
orStep = oRound.getStep();
orComp = oRound.getOperatingCompany();
! log.debug("Or comp index = " + orCompIndex+" in round "+oRound.getRoundName());
log.debug("OR company = " + orComp.getName());
log.debug("OR step=" + orStep + " "
***************
*** 1335,1340 ****
public void setORCompanyTurn(int orCompIndex) {
- orPanel.resetORCompanyTurn(orCompIndex);
-
this.orCompIndex = orCompIndex;
orComp = orCompIndex >= 0 ? companies[orCompIndex] : null;
--- 1336,1339 ----
|
