rails-commits

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

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

Modified Files:
	GUIHex.java 
Log Message:
Fixed phase-dependent revenues on non-offboard (red) hexes.

Index: GUIHex.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUIHex.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** GUIHex.java	5 Jan 2010 20:53:15 -0000	1.34
--- GUIHex.java	9 Jan 2010 13:30:24 -0000	1.35
***************
*** 605,619 ****
          // TEMPORARY
          tt.append("<small> rot=" + currentTileOrientation + "</small>");
!         if (currentTile.getColourName().equalsIgnoreCase(Tile.RED_COLOUR_NAME)) {
!             if (model.hasOffBoardValues()) {
!                 tt.append("<br>Offboard value ");
!                 tt.append(model.getCurrentOffBoardValue(hexMap.getPhase())).append(" [");
!                 int[] values = model.getOffBoardValues();
!                 for (int i = 0; i < values.length; i++) {
!                     if (i > 0) tt.append(",");
!                     tt.append(values[i]);
!                 }
!                 tt.append("]");
              }
          } else if (currentTile.hasStations()) {
              Station st;
--- 605,618 ----
          // TEMPORARY
          tt.append("<small> rot=" + currentTileOrientation + "</small>");
! 
!         if (model.hasOffBoardValues()) {
!             tt.append("<br>Value ");
!             tt.append(model.getCurrentOffBoardValue(hexMap.getPhase())).append(" [");
!             int[] values = model.getOffBoardValues();
!             for (int i = 0; i < values.length; i++) {
!                 if (i > 0) tt.append(",");
!                 tt.append(values[i]);
              }
+             tt.append("]");
          } else if (currentTile.hasStations()) {
              Station st;