rails-commits

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

 data/1830/CompanyManager.xml        |    2 +-
 rails/common/parser/GameOption.java |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit be6c0003bb345032e3e046b312834bb90e54160e
Author: Erik Vos <eri...@xs...>
Date:   Mon Aug 15 22:06:43 2011 +0200

    Fixes by Bill Rosgen: 1830 Reading C&O home, and GameOption names.

diff --git a/data/1830/CompanyManager.xml b/data/1830/CompanyManager.xml
index 769e079..3623f7f 100644
--- a/data/1830/CompanyManager.xml
+++ b/data/1830/CompanyManager.xml
@@ -90,7 +90,7 @@
 	</Company>
 	<Company name="C&amp;O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF"
 			longname="Chesapeake &amp; Ohio">
-		<IfOption name="Variant" value="Basegame,Pere Marquette,Simple,Wabash">
+		<IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Simple,Wabash">
 			<Home hex="F6"/>
 		</IfOption>
 		<IfOption name="Variant" value="Coalfields,Coalfields&amp;Reading">
diff --git a/rails/common/parser/GameOption.java b/rails/common/parser/GameOption.java
index 3889dd7..009f9e0 100644
--- a/rails/common/parser/GameOption.java
+++ b/rails/common/parser/GameOption.java
@@ -59,7 +59,10 @@ public class GameOption {
     }
 
     public String getName() {
-        return parametrisedName;
+        if (parametrisedName != null)
+            return parametrisedName;
+        
+        return name;
     }
 
     public String getLocalisedName() {