[Rails-commits] 18xx/rails/game OperatingRound.java, 1.119, 1.120 GameManager.java, 1.94, 1.95 GameManagerI.java, 1.29, 1.30

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

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

Modified Files:
	OperatingRound.java GameManager.java GameManagerI.java 
Log Message:
Prussian formation

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** OperatingRound.java	23 Mar 2010 18:44:44 -0000	1.119
--- OperatingRound.java	27 Mar 2010 18:44:24 -0000	1.120
***************
*** 1586,1590 ****
  
          // Check if the phase has changed.
!         gameManager.getTrainManager().checkTrainAvailability(train, oldHolder);
  
          // Check if any companies must discard trains
--- 1586,1591 ----
  
          // Check if the phase has changed.
!         TrainManager tm = gameManager.getTrainManager();
!         tm.checkTrainAvailability(train, oldHolder);
  
          // Check if any companies must discard trains
***************
*** 1593,1596 ****
--- 1594,1599 ----
          }
  
+         if (tm.hasPhaseChanged()) gameManager.newPhaseChecks(this);
+         
          return true;
      }
***************
*** 1623,1629 ****
--- 1626,1638 ----
          } else if (savedAction instanceof RepayLoans) {
              executeRepayLoans ((RepayLoans) savedAction);
+         } else if (savedAction == null) {
+             //nextStep();
          }
          savedAction = null;
          wasInterrupted.set(true);
+ 
+         guiHints.setVisibilityHint(GuiDef.Panel.STOCK_MARKET, false);
+         guiHints.setVisibilityHint(GuiDef.Panel.STATUS, true);
+         guiHints.setActivePanel(GuiDef.Panel.MAP);
      }
  

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** GameManager.java	23 Mar 2010 18:44:55 -0000	1.94
--- GameManager.java	27 Mar 2010 18:44:24 -0000	1.95
***************
*** 652,655 ****
--- 652,660 ----
      }
  
+     /** Stub, can be overridden in subclasses with actual actions */
+     public void newPhaseChecks (RoundI round) {
+         
+     }
+     
      public String getORId () {
          if (showCompositeORNumber) {

Index: GameManagerI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManagerI.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** GameManagerI.java	14 Mar 2010 13:10:14 -0000	1.29
--- GameManagerI.java	27 Mar 2010 18:44:24 -0000	1.30
***************
*** 32,35 ****
--- 32,36 ----
       */
      public abstract void nextRound(RoundI round);
+     public void newPhaseChecks (RoundI round);
  
      public String getORId ();