cpp/openttd-patchpack/source File Diff

File diff r7392:a2dff6935901 → r7393:d9b5bcff3577

src/strings.cpp

➞

Show inline comments

@@ @@ -693,13 +693,13 @@ static char* FormatString(char* buff, co @@
 			case SCC_CARGO: { // {CARGO}
 				/* Layout now is:
 				 *   8bit   - cargo type
 				 *   16-bit - cargo count */
 				CargoID cargo = GetInt32(&argv);
-				StringID cargo_str = (cargo == CT_INVALID) ? (StringID)STR_8838_N_A : GetCargo(cargo)->quantifier;
 				StringID cargo_str = (cargo == CT_INVALID) ? STR_8838_N_A : GetCargo(cargo)->quantifier;
 				buff = GetStringWithArgs(buff, cargo_str, argv++, last);
 				break;
+			}
 			case SCC_POWER: { // {POWER}
 				int64 args[1];
@@ @@ -849,13 +849,13 @@ static char* FormatString(char* buff, co @@
 				const Group *g = GetGroup(GetInt32(&argv));
 				int64 args[1];
 				assert(g->IsValid());
 				args[0] = g->index;
-				buff = GetStringWithArgs(buff, IsCustomName(g->string_id) ? g->string_id : (StringID)STR_GROUP_NAME_FORMAT, args, last);
 				buff = GetStringWithArgs(buff, IsCustomName(g->string_id) ? g->string_id : STR_GROUP_NAME_FORMAT, args, last);
 				break;
+			}
 			case SCC_ENGINE_NAME: { // {ENGINE}
 				EngineID engine = (EngineID)GetInt32(&argv);