rails-commits

[Erik V. <ev...@us...>]

Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv16112/rails/ui/swing/hexmap

Modified Files:
	GUIHex.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: GUIHex.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUIHex.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** GUIHex.java	9 Apr 2010 07:20:27 -0000	1.40
--- GUIHex.java	11 Apr 2010 15:49:47 -0000	1.41
***************
*** 359,363 ****
          }
  
!         if (getHexModel().isBlocked()) {
              List<PrivateCompanyI> privates =
                      GameManager.getInstance().getCompanyManager().getAllPrivateCompanies();
--- 359,363 ----
          }
  
!         if (getHexModel().isBlockedForTileLays()) {
              List<PrivateCompanyI> privates =
                      GameManager.getInstance().getCompanyManager().getAllPrivateCompanies();