Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv32432/rails/game
Modified Files:
StartRound.java GameManager.java GameOption.java
Log Message:
Moved "Variant" game option name to GameOption
Index: StartRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** StartRound.java 31 Jan 2010 22:22:28 -0000 1.35
--- StartRound.java 8 May 2010 13:56:30 -0000 1.36
***************
*** 62,66 ****
public void start() {
! this.variant = gameManager.getGameOption(GameManager.VARIANT_KEY);
if (variant == null) variant = "";
numPlayers = gameManager.getNumberOfPlayers();
--- 62,66 ----
public void start() {
! this.variant = gameManager.getGameOption(GameOption.VARIANT);
if (variant == null) variant = "";
numPlayers = gameManager.getNumberOfPlayers();
Index: GameOption.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameOption.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** GameOption.java 23 Feb 2010 22:21:39 -0000 1.11
--- GameOption.java 8 May 2010 13:56:30 -0000 1.12
***************
*** 23,26 ****
--- 23,30 ----
// A default option that will always be set
public static final String NUMBER_OF_PLAYERS = "NumberOfPlayers";
+
+ // Some other common game options
+ public static final String VARIANT = "Variant";
+
public GameOption(String name) {
Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** GameManager.java 9 Apr 2010 21:26:12 -0000 1.99
--- GameManager.java 8 May 2010 13:56:30 -0000 1.100
***************
*** 190,196 ****
new ArrayList<GameOption>();
- /* Some standard tags for conditional attributes */
- public static final String VARIANT_KEY = "Variant";
-
protected static Logger log =
Logger.getLogger(GameManager.class.getPackage().getName());
--- 190,193 ----
|
