# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1298217611 0
# Node ID 7e1b27843b0d09f5ed800d5720eb64415cae5deb
# Parent  e1438fb9024ceeaa7ba9f386c1afa68422a2c8b3
Fixes #99: Define "points" values in GameSystem
 * Implement fall-back in case only one value has been set

diff -r e1438fb9024c -r 7e1b27843b0d api/Objects/GameSystem.cs
--- a/api/Objects/GameSystem.cs	Sun Feb 13 21:03:12 2011 +0000
+++ b/api/Objects/GameSystem.cs	Sun Feb 20 16:00:11 2011 +0000
@@ -324,14 +324,30 @@
 		
 		public string GetPointsAbbrev(double pointTemp)
 		{
-			string str = (pointTemp == 1 ? SystemPtsAbbrevSingle : SystemPtsAbbrevPlural);
-			return (str == null ? "" : str);
+			string abbrev = (pointTemp == 1 ? GetPreferredString(SystemPtsAbbrevSingle, SystemPtsAbbrevPlural) : GetPreferredString(SystemPtsAbbrevPlural, SystemPtsAbbrevSingle));
+			return abbrev;
 		}
 
 		public string GetPointsName(double pointTemp)
 		{
-			string str = (pointTemp == 1 ? SystemPtsNameSingle : SystemPtsNamePlural);
-			return (str == null ? "" : str);
+			string ptsName = (pointTemp == 1 ? GetPreferredString(SystemPtsNameSingle, SystemPtsNamePlural) : GetPreferredString(SystemPtsNamePlural, SystemPtsNameSingle));
+			return ptsName;
+		}
+		
+		private string GetPreferredString(string str1, string str2)
+		{
+			string preferred = "";
+			
+			if (str1 != null)
+			{
+				preferred = str1;
+			}
+			else if (str2 != null)
+			{
+				preferred = str2;
+			}
+			
+			return preferred;
 		}
 	}
 }