Update of /cvsroot/rails/18xx/rails/ui/swing
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv16112/rails/ui/swing
Modified Files:
ORUIManager.java
Log Message:
Added OperatingRound methods isBlockedForTileLays() and isBlockedForTokenLays().
The former replaces the existing isBLocked() (for privates still in operation).
The latter is new and covers various cases where unlaid home bases prevent other companies to lay base tokens on a hex.
Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** ORUIManager.java 9 Apr 2010 17:49:31 -0000 1.64
--- ORUIManager.java 11 Apr 2010 15:49:47 -0000 1.65
***************
*** 674,678 ****
tile.getColourName().equalsIgnoreCase(Tile.YELLOW_COLOUR_NAME)
// Does not apply to the current company's home hex(es)
! && !hex.getHexModel().isHome(orComp)
// Does not apply to special tile lays
&& !isUnconnectedTileLayTarget(hex);
--- 674,678 ----
tile.getColourName().equalsIgnoreCase(Tile.YELLOW_COLOUR_NAME)
// Does not apply to the current company's home hex(es)
! && !hex.getHexModel().isHomeFor(orComp)
// Does not apply to special tile lays
&& !isUnconnectedTileLayTarget(hex);
|
