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

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

Revision: 1445
          http://rails.svn.sourceforge.net/rails/?rev=1445&view=rev
Author:   evos
Date:     2010-10-11 17:22:49 +0000 (Mon, 11 Oct 2010)

Log Message:
-----------
At each OR turn end, check if the company order has changed (if dynamic; this does not apply to 1825)

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

Modified: trunk/18xx/rails/game/GameManager.java
===================================================================
--- trunk/18xx/rails/game/GameManager.java	2010-10-11 17:22:10 UTC (rev 1444)
+++ trunk/18xx/rails/game/GameManager.java	2010-10-11 17:22:49 UTC (rev 1445)
@@ -87,6 +87,8 @@
     protected int gameEndsWhenBankHasLessOrEqual = 0;
     protected boolean gameEndsAfterSetOfORs = true;
 
+    protected boolean dynamicOperatingOrder = true;
+
     protected EnumMap<GameDef.Parm, Object> gameParameters
             = new EnumMap<GameDef.Parm, Object>(GameDef.Parm.class);
 
@@ -330,6 +332,12 @@
                     throw new ConfigurationException("Cannot find class "
                             + orClassName, e);
                 }
+
+                Tag orderTag = orTag.getChild("OperatingOrder");
+                if (orderTag != null) {
+                	dynamicOperatingOrder = orderTag.getAttributeAsBoolean("dynamic",
+                			dynamicOperatingOrder);
+                }
             }
 
             /* Max. % of shares of one company that a player may hold */
@@ -1179,7 +1187,12 @@
         createRound(EndOfGameRound.class);
     }
 
-    /* (non-Javadoc)
+
+    public boolean isDynamicOperatingOrder() {
+		return dynamicOperatingOrder;
+	}
+
+	/* (non-Javadoc)
      * @see rails.game.GameManagerI#isGameOver()
      */
     public boolean isGameOver() {

Modified: trunk/18xx/rails/game/GameManagerI.java
===================================================================
--- trunk/18xx/rails/game/GameManagerI.java	2010-10-11 17:22:10 UTC (rev 1444)
+++ trunk/18xx/rails/game/GameManagerI.java	2010-10-11 17:22:49 UTC (rev 1445)
@@ -68,6 +68,8 @@
 
     public abstract void registerBrokenBank();
 
+    public boolean isDynamicOperatingOrder();
+
     /**
      * To be called by the UI to check if the rails.game is over.
      *


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