[Rails-commits] 18xx/rails/game Game.java,1.22,1.23

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

Update of /cvsroot/rails/18xx/rails/game
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28875/rails/game

Modified Files:
	Game.java 
Log Message:
Minor change in initialisation sequence

Index: Game.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Game.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Game.java	4 May 2009 20:29:14 -0000	1.22
--- Game.java	28 Aug 2009 20:25:28 -0000	1.23
***************
*** 2,5 ****
--- 2,8 ----
  package rails.game;
  
+ import java.io.*;
+ import java.util.*;
+ 
  import org.apache.log4j.Logger;
  
***************
*** 8,16 ****
  import rails.util.Tag;
  
- import java.io.File;
- import java.io.FileInputStream;
- import java.io.ObjectInputStream;
- import java.util.*;
- 
  public class Game {
      public static final String version = "1.0.5";
--- 11,14 ----
***************
*** 66,70 ****
  
      public void start() {
!         gameManager.startGame(playerManager, companyManager, 
                  phaseManager, trainManager);
      }
--- 64,68 ----
  
      public void start() {
!         gameManager.startGame(playerManager, companyManager,
                  phaseManager, trainManager);
      }
***************
*** 143,149 ****
               * only be done after all XML has been processed.
               */
              bank.initCertificates();
              StartPacket.init();
!             companyManager.initCompanies(gameManager);
              stockMarket.init();
          } catch (Exception e) {
--- 141,148 ----
               * only be done after all XML has been processed.
               */
+             companyManager.initCompanies(gameManager);
              bank.initCertificates();
              StartPacket.init();
!             //companyManager.initCompanies(gameManager);
              stockMarket.init();
          } catch (Exception e) {
***************
*** 255,259 ****
          return instance.playerManager;
      }
!     
      public GameManagerI getGameManager() {
          return gameManager;
--- 254,258 ----
          return instance.playerManager;
      }
! 
      public GameManagerI getGameManager() {
          return gameManager;