src/strings.cpp
changeset 6685 410bba0abb67
parent 6683 7ec558346172
child 6719 4cc327ad39d5
child 6916 e87d54a598ea
equal deleted inserted replaced
6684:befa81f3e637 6685:410bba0abb67
   583 						modifier = 0;
   583 						modifier = 0;
   584 						break;
   584 						break;
   585 					}
   585 					}
   586 
   586 
   587 					default:
   587 					default:
   588 						buff = FormatCommaNumber(buff, GetInt32(&argv), last);
   588 						if (cargo_str >= 0xE000 && cargo_str < 0xF800) {
   589 						buff = strecpy(buff, " ", last);
   589 							/* NewGRF strings from Action 4 use a different format here,
   590 						buff = strecpy(buff, GetStringPtr(cargo_str), last);
   590 							 * of e.g. "x tonnes of coal", so process accordingly. */
       
   591 							buff = GetStringWithArgs(buff, cargo_str, argv++, last);
       
   592 						} else {
       
   593 							buff = FormatCommaNumber(buff, GetInt32(&argv), last);
       
   594 							buff = strecpy(buff, " ", last);
       
   595 							buff = strecpy(buff, GetStringPtr(cargo_str), last);
       
   596 						}
   591 						break;
   597 						break;
   592 				}
   598 				}
   593 			} break;
   599 			} break;
   594 
   600 
   595 			case SCC_CURRENCY_COMPACT_64: { /* {CURRCOMPACT64} */
   601 			case SCC_CURRENCY_COMPACT_64: { /* {CURRCOMPACT64} */