(svn r21222) -Codechange: unify some string drawing and make it use the proper infrastructure for that...

src/strings.cpp

@@ -675,15 +675,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei,
 					}
 
 					default:
-						if (cargo_str >= 0xE000 && cargo_str < 0xF800) {
-							/* NewGRF strings from Action 4 use a different format here,
-							 * of e.g. "x tonnes of coal", so process accordingly. */
-							buff = GetStringWithArgs(buff, cargo_str, argv++, last);
-						} else {
-							buff = FormatCommaNumber(buff, GetInt32(&argv), last);
-							buff = strecpy(buff, " ", last);
-							buff = strecpy(buff, GetStringPtr(cargo_str), last);
-						}
+						buff = GetStringWithArgs(buff, cargo_str, argv++, last);
 						break;
 				}
 				break;