[Rails-commits] 18xx/rails/game OperatingRound.java, 1.105, 1.106 GameOption.java, 1.10, 1.11 GameManager.java, 1.83, 1.84

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

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

Modified Files:
	OperatingRound.java GameOption.java GameManager.java 
Log Message:
Added better support for B and C privates
Minor fix to boolean conversion of GameOptions

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** OperatingRound.java	22 Feb 2010 22:48:18 -0000	1.105
--- OperatingRound.java	23 Feb 2010 22:21:39 -0000	1.106
***************
*** 97,101 ****
          
          // sfy NoMapMode
!         noMapMode = GameOption.convertValueToBoolean("NoMapMode", getGameOption("NoMapMode"));
          
          guiHints.setVisibilityHint(GuiDef.Panel.STOCK_MARKET, false);
--- 97,101 ----
          
          // sfy NoMapMode
!         noMapMode = GameOption.convertValueToBoolean(getGameOption("NoMapMode"));
          
          guiHints.setVisibilityHint(GuiDef.Panel.STOCK_MARKET, false);

Index: GameOption.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameOption.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GameOption.java	14 Feb 2010 20:48:02 -0000	1.10
--- GameOption.java	23 Feb 2010 22:21:39 -0000	1.11
***************
*** 103,109 ****
  
      /** Get GameOption Value as Boolean Value */
!     public static boolean convertValueToBoolean(String name, String value) {
          return value != null 
-             && optionsMap.get(name).isBoolean 
              && OPTION_VALUE_YES.equalsIgnoreCase(value);
      }
--- 103,108 ----
  
      /** Get GameOption Value as Boolean Value */
!     public static boolean convertValueToBoolean(String value) {
          return value != null 
              && OPTION_VALUE_YES.equalsIgnoreCase(value);
      }

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** GameManager.java	17 Feb 2010 00:22:15 -0000	1.83
--- GameManager.java	23 Feb 2010 22:21:39 -0000	1.84
***************
*** 492,496 ****
          }
          
!         if (GameOption.convertValueToBoolean("NoMapMode", getGameOption("NoMapMode")))
              guiParameters.put(GuiDef.Parm.NO_MAP_MODE, true);
          
--- 492,496 ----
          }
          
!         if (GameOption.convertValueToBoolean(getGameOption("NoMapMode")))
              guiParameters.put(GuiDef.Parm.NO_MAP_MODE, true);