(svn r2561) Fix: Remove {COMMA16} and {COMMA8}. Those are not needed anymore.

2 files changed, 5 insertions, 6 deletions

diff --git a/strgen/strgen.c b/strgen/strgen.c
index 52540110b..a85d59b58 100644
--- a/strgen/strgen.c
+++ b/strgen/strgen.c
@@ -238,9 +238,10 @@ static const CmdStruct _cmd_structs[] = {
 	// 0x7B=123 is the LAST special character we may use.
 
 	// Numbers
-	{"COMMA32", EmitSingleByte, 0x7B},
-	{"COMMA16", EmitSingleByte, 0x7C},
-	{"COMMA8", EmitSingleByte, 0x7D},
+	{"COMMA32", EmitSingleByte, 0x7B}, // These all do the same thing nowadays
+	{"COMMA16", EmitSingleByte, 0x7B},
+	{"COMMA8", EmitSingleByte, 0x7B},
+
 	{"NUMU16", EmitSingleByte, 0x7E},
 
 	{"CURRENCY", EmitSingleByte, 0x7F},
diff --git a/strings.c b/strings.c
index 11632a97f..9306a4308 100644
--- a/strings.c
+++ b/strings.c
@@ -413,10 +413,8 @@ static char *DecodeString(char *buff, const char *str)
 			buff = FormatCommaNumber(buff, GetParamInt32());
 			break;
 		case 0x7C: // {COMMA16}
-			buff = FormatCommaNumber(buff, GetParamInt16());
-			break;
 		case 0x7D: // {COMMA8}
-			buff = FormatCommaNumber(buff, GetParamInt8());
+			assert(0);
 			break;
 		case 0x7E: // {NUMU16}
 			buff = FormatNoCommaNumber(buff, GetParamInt16());