cpp/openttd-patchpack/source Changeset - r2053:fbf1210a991f

Changeset - r2053:fbf1210a991f

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

ludde - 19 years ago 2005-07-13 20:41:44
ludde@openttd.org

(svn r2562) Fix: Merged {NUMU16}, {INT32}. They do the same thing now.

2 files changed with 4 insertions and 7 deletions:

strgen/strgen.c

strings.c

0 comments (0 inline, 0 general)

strgen/strgen.c

➞

Show inline comments

@@ @@ -242,13 +242,13 @@ static const CmdStruct _cmd_structs[] = @@
 	{"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

strings.c

➞

Show inline comments

@@ @@ -416,8 +416,8 @@ static char *DecodeString(char *buff, co @@
 		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 @@ static char *DecodeString(char *buff, co @@
 			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;

0 comments (0 inline, 0 general)