[Rails-commits] 18xx/rails/util Tag.java, 1.11, 1.12 Util.java, 1.16, 1.17

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

Update of /cvsroot/rails/18xx/rails/util
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27496/rails/util

Modified Files:
	Tag.java Util.java 
Log Message:
1856: allowing unlimited Bridge/Tunnel bonus tokens as a game option

Index: Util.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/util/Util.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Util.java	13 Dec 2009 16:39:49 -0000	1.16
--- Util.java	28 Dec 2009 14:53:00 -0000	1.17
***************
*** 115,119 ****
      		}
      	}
-     	//getLogger().debug("+++ String:"+s+" Color:"+c);
      	return c;
      }
--- 115,118 ----

Index: Tag.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/util/Tag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Tag.java	30 Oct 2009 21:53:04 -0000	1.11
--- Tag.java	28 Dec 2009 14:53:00 -0000	1.12
***************
*** 299,307 ****
                      String optionValue = gameOptions.get(name);
                      if (optionValue == null) {
-                          log.warn("GameOption " + name + "=" + value
-                                  + " but no assigned value found");
                          // Take the default value
!                         	optionValue =
!                                 GameOption.getByName(name).getDefaultValue();
  
                      }
--- 299,307 ----
                      String optionValue = gameOptions.get(name);
                      if (optionValue == null) {
                          // Take the default value
!                         optionValue =
!                             GameOption.getByName(name).getDefaultValue();
!                         log.warn("GameOption " + name + "=" + value
!                                  + " but no assigned value found, assumed "+optionValue);
  
                      }