Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11359/rails/game
Modified Files:
GameManager.java
Log Message:
All displayMessage() methods moved to GameUIManager, which now uses the new nonmodal MessageDialog
Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** GameManager.java 19 Jan 2010 19:53:53 -0000 1.79
--- GameManager.java 20 Jan 2010 19:52:44 -0000 1.80
***************
*** 690,695 ****
guiHints.clearVisibilityHints();
! // The action is null only immediately after Load.
! if (action != null) {
action.setActed();
--- 690,700 ----
guiHints.clearVisibilityHints();
! if (action instanceof NullAction && ((NullAction)action).getMode() == NullAction.START_GAME) {
! // Skip processing at game start after Load.
! // We're only here to create PossibleActions.
! result = true;
!
! } else if (action != null) {
! // Should never be null.
action.setActed();
|
