[Rails-commits] 18xx/rails/game GameManagerI.java, 1.27, 1.28 GameManager.java, 1.90, 1.91 Bank.java, 1.20, 1.21

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

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

Modified Files:
	GameManagerI.java GameManager.java Bank.java 
Log Message:
Change broken bank to state variable. Dialog handling changed to standard procedures.

Index: Bank.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Bank.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Bank.java	3 Feb 2010 05:37:54 -0000	1.20
--- Bank.java	14 Mar 2010 08:06:44 -0000	1.21
***************
*** 7,10 ****
--- 7,11 ----
  import rails.game.model.CashModel;
  import rails.game.model.ModelObject;
+ import rails.game.state.BooleanState;
  import rails.util.*;
  
***************
*** 30,36 ****
  
      /** Is the bank broken (remains true once set) */
!     private boolean broken = false;
!     /** Is the bank just broken (returns true exactly once) */
!     private boolean brokenReported = false;
  
      /**
--- 31,37 ----
  
      /** Is the bank broken (remains true once set) */
!     private BooleanState broken = new BooleanState("Bank.broken", false);
! //    /** Is the bank just broken (returns true exactly once) */
! //    private BooleanState brokenReported = new BooleanState("Bank.brokenReported", false);
  
      /**
***************
*** 143,149 ****
           * will become configurable.
           */
!         if (money.getCash() <= 0 && !broken) {
!             broken = true;
!             ReportBuffer.add(LocalText.getText("BankIsBroken"));
          }
          return negative;
--- 144,150 ----
           * will become configurable.
           */
!         if (money.getCash() <= 0 && !broken.booleanValue()) {
!             broken.set(true);
!             GameManager.getInstance().registerBrokenBank();
          }
          return negative;
***************
*** 151,162 ****
  
      public boolean isBroken() {
!         return broken;
      }
  
!     public boolean isJustBroken() {
!         boolean result = broken && !brokenReported;
!         brokenReported = true;
!         return result;
!     }
  
      /**
--- 152,163 ----
  
      public boolean isBroken() {
!         return broken.booleanValue();
      }
  
! //    public boolean isJustBroken() {
! //        boolean result = broken.booleanValue() && !brokenReported.booleanValue();
! //        brokenReported.set(true);
! //        return result;
! //    }
  
      /**

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** GameManager.java	12 Mar 2010 20:28:27 -0000	1.90
--- GameManager.java	14 Mar 2010 08:06:41 -0000	1.91
***************
*** 998,1001 ****
--- 998,1013 ----
          }
      }
+     
+     public void registerBrokenBank(){
+         ReportBuffer.add(LocalText.getText("BankIsBrokenReportText"));
+         String msgContinue;
+         if (gameEndsAfterSetOfORs)
+             msgContinue = LocalText.getText("bankIsBrokenPlaySetOfORs");
+         else
+             msgContinue = LocalText.getText("bankIsBrokenPlayOnlyOR");
+         String msg = LocalText.getText("BankIsBrokenDisplayText", msgContinue);
+         DisplayBuffer.add(msg);
+         addToNextPlayerMessages(msg, true);
+     }
  
      private void finishGame() {

Index: GameManagerI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManagerI.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** GameManagerI.java	31 Jan 2010 22:22:28 -0000	1.27
--- GameManagerI.java	14 Mar 2010 08:06:39 -0000	1.28
***************
*** 8,11 ****
--- 8,12 ----
  import rails.game.action.PossibleAction;
  import rails.game.model.ModelObject;
+ import rails.game.move.AddToList;
  import rails.game.move.MoveStack;
  import rails.game.move.MoveableHolder;
***************
*** 61,64 ****
--- 62,67 ----
      public abstract void registerBankruptcy();
  
+     public abstract void registerBrokenBank();
+ 
      /**
       * To be called by the UI to check if the rails.game is over.
***************
*** 186,189 ****
--- 189,193 ----
      public MoveStack getMoveStack ();
      public DisplayBuffer getDisplayBuffer();
+     public void addToNextPlayerMessages(String s, boolean undoable); 
      public ReportBuffer getReportBuffer();
      public GuiHints getUIHints();