[Rails-commits] SF.net SVN: rails:[1418] trunk/18xx/rails/game/OperatingRound.java

[<ste...@us...>]

Revision: 1418
          http://rails.svn.sourceforge.net/rails/?rev=1418&view=rev
Author:   stefanfrey
Date:     2010-09-10 16:30:21 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
Removed check for special tile lay, that the
new tile should be allowed in the current phase
(breaks existing game files)

Modified Paths:
--------------
    trunk/18xx/rails/game/OperatingRound.java

Modified: trunk/18xx/rails/game/OperatingRound.java
===================================================================
--- trunk/18xx/rails/game/OperatingRound.java	2010-09-08 21:42:53 UTC (rev 1417)
+++ trunk/18xx/rails/game/OperatingRound.java	2010-09-10 16:30:21 UTC (rev 1418)
@@ -1339,9 +1339,11 @@
         if (!operatingCompany.get().canUseSpecialProperties()) return;
 
         for (SpecialTileLay stl : getSpecialProperties(SpecialTileLay.class)) {
-            if (getCurrentPhase().isTileColourAllowed(stl.getTile().getColourName())
+            if (
+//                 stl.getTile() != null && getCurrentPhase().isTileColourAllowed(stl.getTile().getColourName()) &&
                  // if a tile is specified it must have a tile colour currently available
-                 &&  (stl.isExtra() || !currentNormalTileLays.isEmpty())) {
+                 // commented out as it is not required and makes 1856 save files invalid
+                  (stl.isExtra() || !currentNormalTileLays.isEmpty())) {
                 // If the special tile lay is not extra, it is only allowed if
                 // normal tile lays are also (still) allowed
                 currentSpecialTileLays.add(new LayTile(stl));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.