[Rails-commits] 18xx/rails/game TileI.java, 1.19, 1.20 Tile.java, 1.40, 1.41

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

Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30026/rails/game

Modified Files:
	TileI.java Tile.java 
Log Message:
Fixed 1835 bug at buying the first 5-train.
Fixed Hamburg tile orientation: can no longer rotate.

Index: TileI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/TileI.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** TileI.java	14 May 2010 15:19:57 -0000	1.19
--- TileI.java	15 May 2010 19:05:39 -0000	1.20
***************
*** 70,73 ****
--- 70,74 ----
  
      public int getQuantity();
+     public int getFixedOrientation ();
  
      public List<RevenueBonusTemplate> getRevenueBonuses();

Index: Tile.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Tile.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Tile.java	14 May 2010 15:19:57 -0000	1.40
--- Tile.java	15 May 2010 19:05:39 -0000	1.41
***************
*** 32,36 ****
      private final List<Upgrade> upgrades = new ArrayList<Upgrade>(); // Contains
      // Upgrade instances
!     private String upgradesString = "";
      @SuppressWarnings("unchecked")
      private final List[] tracksPerSide = new ArrayList[6];
--- 32,36 ----
      private final List<Upgrade> upgrades = new ArrayList<Upgrade>(); // Contains
      // Upgrade instances
!     //private String upgradesString = "";
      @SuppressWarnings("unchecked")
      private final List[] tracksPerSide = new ArrayList[6];
***************
*** 44,47 ****
--- 44,49 ----
      private boolean unlimited = false;
      private boolean allowsMultipleBasesOfOneCompany = false;
+     /** Fixed orientation; -1 if free to rotate */
+     private int fixedOrientation = -1;
  
      public static final int UNLIMITED_TILES = -1;
***************
*** 125,129 ****
          }
          colourNumber -= TILE_NUMBER_OFFSET;
! 
          /* Stations */
          List<Tag> stationTags = defTag.getChildren("Station");
--- 127,131 ----
          }
          colourNumber -= TILE_NUMBER_OFFSET;
!         
          /* Stations */
          List<Tag> stationTags = defTag.getChildren("Station");
***************
*** 213,216 ****
--- 215,220 ----
                  "AllowsMultipleBasesOfOneCompany");
  
+         fixedOrientation = setTag.getAttributeAsInteger("orientation", fixedOrientation);
+ 
          /* Upgrades */
          List<Tag> upgradeTags = setTag.getChildren("Upgrade");
***************
*** 225,229 ****
              for (Tag upgradeTag : upgradeTags) {
                  ids = upgradeTag.getAttributeAsString("id");
!                 upgradesString = ids; // TEMPORARY
                  List<Upgrade> newUpgrades = new ArrayList<Upgrade>();
  
--- 229,233 ----
              for (Tag upgradeTag : upgradeTags) {
                  ids = upgradeTag.getAttributeAsString("id");
!                 //upgradesString = ids; // TEMPORARY
                  List<Upgrade> newUpgrades = new ArrayList<Upgrade>();
  
***************
*** 493,496 ****
--- 497,504 ----
          return quantity;
      }
+     
+     public int getFixedOrientation () {
+         return fixedOrientation;
+     }
  
      public List<RevenueBonusTemplate> getRevenueBonuses() {