mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r27707) -Fix: Make the result of NewGRF's CARGO_NAME string code reliably print 'Nothing', if an invalid type is provided.
This commit is contained in:
parent
b25afb239a
commit
1a92b0c7c3
|
@ -1062,9 +1062,11 @@ uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const
|
||||||
*argv = MapGRFStringID(_newgrf_textrefstack.grffile->grfid, _newgrf_textrefstack.PopUnsignedWord());
|
*argv = MapGRFStringID(_newgrf_textrefstack.grffile->grfid, _newgrf_textrefstack.PopUnsignedWord());
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SCC_NEWGRF_PRINT_WORD_CARGO_NAME:
|
case SCC_NEWGRF_PRINT_WORD_CARGO_NAME: {
|
||||||
*argv = 1 << GetCargoTranslation(_newgrf_textrefstack.PopUnsignedWord(), _newgrf_textrefstack.grffile);
|
CargoID cargo = GetCargoTranslation(_newgrf_textrefstack.PopUnsignedWord(), _newgrf_textrefstack.grffile);
|
||||||
|
*argv = cargo < NUM_CARGO ? 1 << cargo : 0;
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* Consume additional parameter characters */
|
/* Consume additional parameter characters */
|
||||||
|
|
Loading…
Reference in New Issue