[Rails-commits] 18xx/rails/game StartRound_1830.java, 1.30, 1.31 StockRound.java, 1.62, 1.63 StartRound_1835.java, 1.24, 1.25 TreasuryShareRound.java, 1.20, 1.21

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

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

Modified Files:
	StartRound_1830.java StockRound.java StartRound_1835.java 
	TreasuryShareRound.java 
Log Message:
Added missing 2nd argument to "WrongPlayer" error messages

Index: TreasuryShareRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/TreasuryShareRound.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** TreasuryShareRound.java	31 Jan 2010 22:22:28 -0000	1.20
--- TreasuryShareRound.java	17 Feb 2010 22:01:44 -0000	1.21
***************
*** 261,265 ****
              // Only the player that has the turn may act
              if (!playerName.equals(currentPlayer.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName);
                  break;
              }
--- 261,265 ----
              // Only the player that has the turn may act
              if (!playerName.equals(currentPlayer.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName, currentPlayer.getName());
                  break;
              }
***************
*** 515,519 ****
  
          if (!playerName.equals(currentPlayer.getName())) {
!             DisplayBuffer.add(LocalText.getText("WrongPlayer", playerName));
              return false;
          }
--- 515,519 ----
  
          if (!playerName.equals(currentPlayer.getName())) {
!             DisplayBuffer.add(LocalText.getText("WrongPlayer", playerName, currentPlayer.getName()));
              return false;
          }

Index: StartRound_1830.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound_1830.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** StartRound_1830.java	5 Feb 2010 19:57:26 -0000	1.30
--- StartRound_1830.java	17 Feb 2010 22:01:43 -0000	1.31
***************
*** 188,192 ****
              // Check player
              if (!playerName.equals(player.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName);
                  break;
              }
--- 188,192 ----
              // Check player
              if (!playerName.equals(player.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName, player.getName());
                  break;
              }
***************
*** 286,290 ****
              // Check player
              if (!playerName.equals(player.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName);
                  break;
              }
--- 286,290 ----
              // Check player
              if (!playerName.equals(player.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName, player.getName());
                  break;
              }

Index: StartRound_1835.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound_1835.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** StartRound_1835.java	5 Feb 2010 19:58:18 -0000	1.24
--- StartRound_1835.java	17 Feb 2010 22:01:44 -0000	1.25
***************
*** 228,232 ****
              // Check player
              if (!playerName.equals(player.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName);
                  break;
              }
--- 228,232 ----
              // Check player
              if (!playerName.equals(player.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName, player.getName());
                  break;
              }

Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** StockRound.java	16 Feb 2010 20:15:36 -0000	1.62
--- StockRound.java	17 Feb 2010 22:01:44 -0000	1.63
***************
*** 510,514 ****
              // Only the player that has the turn may buy
              if (!playerName.equals(currentPlayer.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName);
                  break;
              }
--- 510,514 ----
              // Only the player that has the turn may buy
              if (!playerName.equals(currentPlayer.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName, currentPlayer.getName());
                  break;
              }
***************
*** 655,659 ****
              // Only the player that has the turn may buy
              if (!playerName.equals(currentPlayer.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName);
                  break;
              }
--- 655,659 ----
              // Only the player that has the turn may buy
              if (!playerName.equals(currentPlayer.getName())) {
!                 errMsg = LocalText.getText("WrongPlayer", playerName, currentPlayer.getName());
                  break;
              }
***************
*** 1173,1177 ****
  
          if (!playerName.equals(currentPlayer.getName())) {
!             DisplayBuffer.add(LocalText.getText("WrongPlayer", playerName));
              return false;
          }
--- 1173,1177 ----
  
          if (!playerName.equals(currentPlayer.getName())) {
!             DisplayBuffer.add(LocalText.getText("WrongPlayer", playerName, currentPlayer.getName()));
              return false;
          }