[Rails-commits] rails/game

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

 rails/game/PublicCompany.java |   14 ++++++++------
 rails/game/Stop.java          |    6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit adfb01e778893115aec455fd3755bd0e1bad3502
Author: Erik Vos <eri...@xs...>
Date:   Thu Oct 13 12:54:13 2011 +0200

    Some code cleanups

diff --git a/rails/game/PublicCompany.java b/rails/game/PublicCompany.java
index b7e8d50..0a0aeb9 100644
--- a/rails/game/PublicCompany.java
+++ b/rails/game/PublicCompany.java
@@ -144,7 +144,7 @@ public class PublicCompany extends Company implements PublicCompanyI {
      * A map per tile colour, holding the number of turns that the tile lay
      * number applies. The default number is always 1.
      */
-    protected Map<String, Integer> turnsWithExtraTileLaysInit = null;
+    //protected Map<String, Integer> turnsWithExtraTileLaysInit = null;
     /** Copy of turnsWithExtraTileLaysInit, per company */
     protected Map<String, IntegerState> turnsWithExtraTileLays = null;
     /**
@@ -449,7 +449,7 @@ public class PublicCompany extends Company implements PublicCompanyI {
             }
         }
 
-        Tag tileLaysTag = tag.getChild("TileLays");
+        /*Tag tileLaysTag = tag.getChild("TileLays");
         if (tileLaysTag != null) {
 
             for (Tag numberTag : tileLaysTag.getChildren("Number")) {
@@ -471,9 +471,9 @@ public class PublicCompany extends Company implements PublicCompanyI {
                 String[] colours = colourString.split(",");
                 HashMap<String, Integer> phaseMap;
                 /**
-                 * TODO: should not be necessary to specify all phases
-                 * separately
-                 */
+         * TODO: should not be necessary to specify all phases
+         * separately
+         *//*
                 String[] phases = phaseString.split(",");
                 for (int i = 0; i < colours.length; i++) {
                     if (extraTileLays == null)
@@ -494,7 +494,7 @@ public class PublicCompany extends Company implements PublicCompanyI {
                     }
                 }
             }
-        }
+        }*/
 
         int certIndex = 0;
         List<Tag> certificateTags = tag.getChildren("Certificate");
@@ -678,6 +678,7 @@ public class PublicCompany extends Company implements PublicCompanyI {
         stockMarket = gameManager.getStockMarket();
         mapManager = gameManager.getMapManager();
 
+        /*
         if (turnsWithExtraTileLaysInit != null) {
             turnsWithExtraTileLays = new HashMap<String, IntegerState>();
             for (String colour : turnsWithExtraTileLaysInit.keySet()) {
@@ -686,6 +687,7 @@ public class PublicCompany extends Company implements PublicCompanyI {
                         turnsWithExtraTileLaysInit.get(colour)));
             }
         }
+         */
 
         if (maxNumberOfLoans != 0) {
             currentNumberOfLoans = new IntegerState (name+"_Loans", 0);
diff --git a/rails/game/Stop.java b/rails/game/Stop.java
index d1e918c..401f18f 100644
--- a/rails/game/Stop.java
+++ b/rails/game/Stop.java
@@ -171,9 +171,9 @@ public class Stop implements TokenHolder {
         if (scoreType == null) scoreType = tileManager.getScoreTypeDefault(type);
         if (scoreType == null) scoreType = type.getDefaultScoreType();
 
-        log.debug("+++ Hex="+mapHex.getName()+" tile="+tile.getId()+" city="+number
-                +": stopType="+type+" runTo="+runToAllowed+" runThrough="+runThroughAllowed
-                +" loop="+loopAllowed+" scoreType="+scoreType);
+        //log.debug("+++ Hex="+mapHex.getName()+" tile="+tile.getId()+" city="+number
+        //        +": stopType="+type+" runTo="+runToAllowed+" runThrough="+runThroughAllowed
+        //        +" loop="+loopAllowed+" scoreType="+scoreType);
     }
 
     public String getName() {