mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-24 12:44:10 +01:00
Code Issues Releases Wiki Activity

(svn r22747) [1.1] -Backport from trunk:

Browse Source 
- Fix: Some corrupted savegames could crash OpenTTD instead of showing the 'savegame corrupted' message [FS#4717] (r22737, r22736)
- Fix: Triggering NOT_REACHED when playing with a NewGRF that supplies genders/cases for a language that was not installed [FS#4718] (r22735)
This commit is contained in:
rubidium
2011-08-14 15:23:10 +00:00
parent 41db186ea7
commit 6f8248c36d
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/newgrf_text.cpp
View File

@@ -293,8 +293,9 @@ struct UnmappedChoiceList : ZeroedMemoryAllocator {
char *d = old_d;
if (lm == NULL && this->type != SCC_PLURAL_LIST) {
NOT_REACHED();
/* In case there is no mapping, just ignore everything but the default. */
/* In case there is no mapping, just ignore everything but the default.
* A probable cause for this happening is when the language file has
* been removed by the user and as such no mapping could be made. */
size_t len = strlen(this->strings[0]);
memcpy(d, this->strings[0], len);
return d + len;