equal
deleted
inserted
replaced
694 case SCC_CARGO: { // {CARGO} |
694 case SCC_CARGO: { // {CARGO} |
695 /* Layout now is: |
695 /* Layout now is: |
696 * 8bit - cargo type |
696 * 8bit - cargo type |
697 * 16-bit - cargo count */ |
697 * 16-bit - cargo count */ |
698 CargoID cargo = GetInt32(&argv); |
698 CargoID cargo = GetInt32(&argv); |
699 StringID cargo_str = (cargo == CT_INVALID) ? (StringID)STR_8838_N_A : GetCargo(cargo)->quantifier; |
699 StringID cargo_str = (cargo == CT_INVALID) ? STR_8838_N_A : GetCargo(cargo)->quantifier; |
700 buff = GetStringWithArgs(buff, cargo_str, argv++, last); |
700 buff = GetStringWithArgs(buff, cargo_str, argv++, last); |
701 break; |
701 break; |
702 } |
702 } |
703 |
703 |
704 case SCC_POWER: { // {POWER} |
704 case SCC_POWER: { // {POWER} |
850 int64 args[1]; |
850 int64 args[1]; |
851 |
851 |
852 assert(g->IsValid()); |
852 assert(g->IsValid()); |
853 |
853 |
854 args[0] = g->index; |
854 args[0] = g->index; |
855 buff = GetStringWithArgs(buff, IsCustomName(g->string_id) ? g->string_id : (StringID)STR_GROUP_NAME_FORMAT, args, last); |
855 buff = GetStringWithArgs(buff, IsCustomName(g->string_id) ? g->string_id : STR_GROUP_NAME_FORMAT, args, last); |
856 |
856 |
857 break; |
857 break; |
858 } |
858 } |
859 |
859 |
860 case SCC_ENGINE_NAME: { // {ENGINE} |
860 case SCC_ENGINE_NAME: { // {ENGINE} |