From d913083c372b40c7ee94550a11eef38fae2641b3 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Thu, 28 Jan 2021 18:21:46 +0000 Subject: [PATCH] Print warning instead of asserting for invalid NewGRF string IDs --- src/newgrf_text.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp index c46fd69fbf..9ddd13dbd0 100644 --- a/src/newgrf_text.cpp +++ b/src/newgrf_text.cpp @@ -684,7 +684,14 @@ const char *GetDefaultLangGRFStringFromGRFText(const GRFTextWrapper &text) */ const char *GetGRFStringPtr(uint16 stringid) { +#if 0 assert_msg(_grf_text[stringid].grfid != 0, "stringid: %u", stringid); +#endif + + if (_grf_text[stringid].grfid == 0) { + DEBUG(misc, 0, "Invalid NewGRF string ID: %d", stringid); + return "(invalid StringID)"; + } const char *str = GetGRFStringFromGRFText(_grf_text[stringid].textholder); if (str == nullptr) {