Update of /cvsroot/rails/18xx/rails/ui/swing
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24424/rails/ui/swing
Modified Files:
ORWindow.java ORPanel.java
Log Message:
Various fixes to CGR formation and operation
Index: ORWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORWindow.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ORWindow.java 19 Jul 2009 19:24:21 -0000 1.24
--- ORWindow.java 2 Sep 2009 21:47:47 -0000 1.25
***************
*** 158,162 ****
String numORs = gameManager.getNumOfORs ();
! if (!or.wasInterrupted()) orPanel.recreate(or);
setTitle(LocalText.getText("MapWindowORTitle",
compositeORNumber,
--- 158,162 ----
String numORs = gameManager.getNumOfORs ();
! /*if (!or.wasInterrupted())*/ orPanel.recreate(or);
setTitle(LocalText.getText("MapWindowORTitle",
compositeORNumber,
Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ORPanel.java 1 Sep 2009 19:30:15 -0000 1.31
--- ORPanel.java 2 Sep 2009 21:47:47 -0000 1.32
***************
*** 392,396 ****
f =
president[i] =
! new Field(c.hasStarted()
? c.getPresident().getNameAndPriority() : "");
addField(f, presidentXOffset, presidentYOffset + i, 1, 1, 0);
--- 392,396 ----
f =
president[i] =
! new Field(c.hasStarted() && !c.isClosed()
? c.getPresident().getNameAndPriority() : "");
addField(f, presidentXOffset, presidentYOffset + i, 1, 1, 0);
|
