(svn r27707) -Fix: Make the result of NewGRF's CARGO_NAME string code reliably print 'Nothing', if an invalid type is provided.

8 years ago · 2be42dadea
parent 9145e5d2b5
commit 2be42dadea
1 changed files with 4 additions and 2 deletions
--- a/src/newgrf_text.cpp
+++ b/src/newgrf_text.cpp
@ -1062,9 +1062,11 @@ uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const
 				*argv = MapGRFStringID(_newgrf_textrefstack.grffile->grfid, _newgrf_textrefstack.PopUnsignedWord());
 				break;

-			case SCC_NEWGRF_PRINT_WORD_CARGO_NAME:
-				*argv = 1 << GetCargoTranslation(_newgrf_textrefstack.PopUnsignedWord(), _newgrf_textrefstack.grffile);
+			case SCC_NEWGRF_PRINT_WORD_CARGO_NAME: {
+				CargoID cargo = GetCargoTranslation(_newgrf_textrefstack.PopUnsignedWord(), _newgrf_textrefstack.grffile);
+				*argv = cargo < NUM_CARGO ? 1 << cargo : 0;
 				break;
+			}
 		}
 	} else {
 		/* Consume additional parameter characters */