[Rails-commits] 18xx/rails/game/specific/_18EU StartCompany_18EU.java, 1.5, 1.6

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

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

Modified Files:
	StartCompany_18EU.java 
Log Message:
Reduced dependence on static access to MapManager

Index: StartCompany_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StartCompany_18EU.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StartCompany_18EU.java	3 Jan 2009 18:24:53 -0000	1.5
--- StartCompany_18EU.java	3 Oct 2009 14:02:28 -0000	1.6
***************
*** 122,131 ****
          }
          
!         MapManager mmgr = MapManager.getInstance();
          if (availableHomeStationNames != null) {
              availableHomeStations = new ArrayList<City>();
              for (String cityName : availableHomeStationNames.split(",")) {
                  String[] parts = parseStationName (cityName); 
!                 MapHex hex = mmgr.getHex(parts[0]);
                  availableHomeStations.add (hex.getCity(Integer.parseInt(parts[1])));
              }
--- 122,131 ----
          }
          
!         MapManager mapManager = MapManager.getInstance();
          if (availableHomeStationNames != null) {
              availableHomeStations = new ArrayList<City>();
              for (String cityName : availableHomeStationNames.split(",")) {
                  String[] parts = parseStationName (cityName); 
!                 MapHex hex = mapManager.getHex(parts[0]);
                  availableHomeStations.add (hex.getCity(Integer.parseInt(parts[1])));
              }
***************
*** 133,137 ****
          if (selectedHomeStationName != null) {
              String[] parts = parseStationName (selectedHomeStationName); 
!             MapHex hex = mmgr.getHex(parts[0]);
              selectedHomeStation = hex.getCity(Integer.parseInt(parts[1]));
          }
--- 133,137 ----
          if (selectedHomeStationName != null) {
              String[] parts = parseStationName (selectedHomeStationName); 
!             MapHex hex = mapManager.getHex(parts[0]);
              selectedHomeStation = hex.getCity(Integer.parseInt(parts[1]));
          }