rails-commits

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

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

Modified Files:
	GameManager.java 
Log Message:
Added nextPlayerMessages and fixed reload bug of cashcorrection action.

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** GameManager.java	8 Mar 2010 20:33:27 -0000	1.87
--- GameManager.java	10 Mar 2010 21:02:13 -0000	1.88
***************
*** 155,159 ****
       */
      protected DisplayBuffer displayBuffer;
! 
      /**
       * The ReportBuffer collectes messages to be shown in the Game Report.
--- 155,163 ----
       */
      protected DisplayBuffer displayBuffer;
!     /**
!      * nextPlayerMessages collects all messages to be displayed to the next player
!      */
!     protected List<String> nextPlayerMessages = new ArrayList<String>();
!     
      /**
       * The ReportBuffer collectes messages to be shown in the Game Report.
***************
*** 921,925 ****
          }
  
!         DisplayBuffer.clear();
          guiHints.clearVisibilityHints();
  
--- 925,930 ----
          }
  
! //        DisplayBuffer.clear(); 
! //        previous line removed to allow display of nextPlayerMessages
          guiHints.clearVisibilityHints();
  
***************
*** 1062,1066 ****
      public void setCurrentPlayerIndex(int currentPlayerIndex) {
          currentPlayerIndex = currentPlayerIndex % numberOfPlayers;
!         currentPlayer.set(players.get(currentPlayerIndex));
      }
  
--- 1067,1073 ----
      public void setCurrentPlayerIndex(int currentPlayerIndex) {
          currentPlayerIndex = currentPlayerIndex % numberOfPlayers;
! //        currentPlayer.set(players.get(currentPlayerIndex));
! //      changed to activate nextPlayerMessages
!         setCurrentPlayer(players.get(currentPlayerIndex));
      }
  
***************
*** 1069,1072 ****
--- 1076,1087 ----
       */
      public void setCurrentPlayer(Player player) {
+         // transfer messages for the next player to the display buffer
+         if ((Player)currentPlayer.getObject() != player && !nextPlayerMessages.isEmpty()) {
+             DisplayBuffer.add(
+                     LocalText.getText("NextPlayerMessage", getCurrentPlayer().getName()));
+             for (String s:nextPlayerMessages)
+                 DisplayBuffer.add(s);
+             nextPlayerMessages.clear();
+         }
          currentPlayer.set(player);
      }
***************
*** 1393,1401 ****
          return displayBuffer;
      }
  
      public ReportBuffer getReportBuffer() {
          return reportBuffer;
      }
! 
      public GuiHints getUIHints() {
          return guiHints;
--- 1408,1423 ----
          return displayBuffer;
      }
+     
+     public void addToNextPlayerMessages(String s, boolean undoable) {
+         if (undoable) 
+             new AddToList<String>(nextPlayerMessages, s, "nextPlayerMessages");
+         else
+             nextPlayerMessages.add(s);
+     }
  
      public ReportBuffer getReportBuffer() {
          return reportBuffer;
      }
!     
      public GuiHints getUIHints() {
          return guiHints;