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

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

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

Modified Files:
	StartCompany_18EU.java 
Log Message:
Fixed bug that disabled buying more than 1 "infinite quantity" train.
Also fixed missing code in StartCompany_18EU deserialization.

Index: StartCompany_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StartCompany_18EU.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StartCompany_18EU.java	4 Jun 2008 19:00:36 -0000	1.4
--- StartCompany_18EU.java	3 Jan 2009 18:24:53 -0000	1.5
***************
*** 121,124 ****
--- 121,151 ----
              chosenMinor = cmgr.getPublicCompany(chosenMinorName);
          }
+         
+         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])));
+             }
+         }
+         if (selectedHomeStationName != null) {
+             String[] parts = parseStationName (selectedHomeStationName); 
+             MapHex hex = mmgr.getHex(parts[0]);
+             selectedHomeStation = hex.getCity(Integer.parseInt(parts[1]));
+         }
+     }
+     
+     private String[] parseStationName (String name) {
+         
+         if (name.contains(" on ")) {
+             // Old style
+             String[] parts = name.split(" ");
+             return new String[] {parts[4], parts[1]};
+         } else {
+             // New style
+             return name.split("/");
+         }
      }