[Rails-commits] 18xx/rails/game OperatingRound.java, 1.120, 1.121 GameManager.java, 1.96, 1.97 GameManagerI.java, 1.31, 1.32

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

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

Modified Files:
	OperatingRound.java GameManager.java GameManagerI.java 
Log Message:
Fixes to get excess train discard before prussion formation on buying the first 4-train in 1835.
And personalizing the Prussian formation prompts.

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** OperatingRound.java	27 Mar 2010 18:44:24 -0000	1.120
--- OperatingRound.java	28 Mar 2010 20:14:20 -0000	1.121
***************
*** 1319,1323 ****
       */
      public boolean done() {
-         String errMsg = null;
  
           if (operatingCompany.getPortfolio().getNumberOfTrains() == 0
--- 1319,1322 ----
***************
*** 1594,1598 ****
          }
  
!         if (tm.hasPhaseChanged()) gameManager.newPhaseChecks(this);
          
          return true;
--- 1593,1597 ----
          }
  
!         if (tm.hasPhaseChanged()) newPhaseChecks();
          
          return true;
***************
*** 1617,1620 ****
--- 1616,1623 ----
      }
  
+     /** Stub */
+     protected void newPhaseChecks() {
+     }
+     
      @Override
      public void resume() {

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** GameManager.java	28 Mar 2010 17:05:55 -0000	1.96
--- GameManager.java	28 Mar 2010 20:14:20 -0000	1.97
***************
*** 55,59 ****
      protected TileManager tileManager;
      protected Bank bank;
!     
      // map of correctionManagers
      protected Map<CorrectionType, CorrectionManagerI> correctionManagers =
--- 55,59 ----
      protected TileManager tileManager;
      protected Bank bank;
! 
      // map of correctionManagers
      protected Map<CorrectionType, CorrectionManagerI> correctionManagers =
***************
*** 656,664 ****
      }
  
-     /** Stub, can be overridden in subclasses with actual actions */
-     public void newPhaseChecks (RoundI round) {
-         
-     }
-     
      public String getORId () {
          if (showCompositeORNumber) {
--- 656,659 ----
***************
*** 1434,1441 ****
              correctionManagers.put(ct, cm);
              log.debug("Added CorrectionManager for " + ct);
!         }
          return cm;
      }
-    
  }
  
--- 1429,1435 ----
              correctionManagers.put(ct, cm);
              log.debug("Added CorrectionManager for " + ct);
! }
          return cm;
      }
  }
  

Index: GameManagerI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManagerI.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** GameManagerI.java	28 Mar 2010 17:05:55 -0000	1.31
--- GameManagerI.java	28 Mar 2010 20:14:20 -0000	1.32
***************
*** 34,38 ****
       */
      public abstract void nextRound(RoundI round);
-     public void newPhaseChecks (RoundI round);
  
      public String getORId ();
--- 34,37 ----
***************
*** 197,201 ****
      public ReportBuffer getReportBuffer();
      public GuiHints getUIHints();
!     
      public CorrectionManagerI getCorrectionManager(CorrectionType ct);
  }
\ No newline at end of file
--- 196,200 ----
      public ReportBuffer getReportBuffer();
      public GuiHints getUIHints();
! 
      public CorrectionManagerI getCorrectionManager(CorrectionType ct);
  }
\ No newline at end of file