(svn r2562) Fix: Merged {NUMU16}, {INT32}. They do the same thing now.
authorludde
Wed, 13 Jul 2005 20:41:44 +0000
changeset 2053 940cea81b43c
parent 2052 4396fc955a39
child 2054 e313dd080bd3
(svn r2562) Fix: Merged {NUMU16}, {INT32}. They do the same thing now.
strgen/strgen.c
strings.c
--- a/strgen/strgen.c	Wed Jul 13 20:35:52 2005 +0000
+++ b/strgen/strgen.c	Wed Jul 13 20:41:44 2005 +0000
@@ -242,13 +242,13 @@
 	{"COMMA16", EmitSingleByte, 0x7B},
 	{"COMMA8", EmitSingleByte, 0x7B},
 
-	{"NUMU16", EmitSingleByte, 0x7E},
+	{"NUMU16", EmitSingleByte, 0x7E}, // These two do the same thing nowadays
+	{"INT32", EmitSingleByte, 0x7E},	// signed 32 bit integer
 
 	{"CURRENCY", EmitSingleByte, 0x7F},
 
 	// 0x85
 	{"CURRCOMPACT", EmitEscapedByte, 0},		// compact currency (32 bits)
-	{"INT32", EmitEscapedByte, 1},					// signed 32 bit integer
 	{"REV", EmitEscapedByte, 2},						// openttd revision string
 	{"SHORTCARGO", EmitEscapedByte, 3},			// short cargo description, only ### tons, or ### litres
 	{"CURRCOMPACT64", EmitEscapedByte, 4},	// compact currency 64 bits
--- a/strings.c	Wed Jul 13 20:35:52 2005 +0000
+++ b/strings.c	Wed Jul 13 20:41:44 2005 +0000
@@ -416,8 +416,8 @@
 		case 0x7D: // {COMMA8}
 			assert(0);
 			break;
-		case 0x7E: // {NUMU16}
-			buff = FormatNoCommaNumber(buff, GetParamInt16());
+		case 0x7E: // {NUMU16}, {INT32}
+			buff = FormatNoCommaNumber(buff, GetParamInt32());
 			break;
 		case 0x7F: // {CURRENCY}
 			buff = FormatGenericCurrency(buff, &_currency_specs[_opt_ptr->currency], GetParamInt32(), false);
@@ -453,9 +453,6 @@
 			case 0: /* {CURRCOMPACT} */
 				buff = FormatGenericCurrency(buff, &_currency_specs[_opt_ptr->currency], GetParamInt32(), true);
 				break;
-			case 1: /* {INT32} */
-				buff = FormatNoCommaNumber(buff, GetParamInt32());
-				break;
 			case 2: /* {REV} */
 				buff = strecpy(buff, _openttd_revision, NULL);
 				break;