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

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

Browse Source 
- Fix: No update of NewGRF window when unknown GRF name becomes available [FS#4533] (r22162)
- Fix: [NewGRF] Industry prop 0x11 is 4-bytes long, not 3 bytes (r22157)
- Fix: Stations/infrastructure were not properly sold on some clients during bankruptcy [FS#4529] (r22154)
- Fix: The Greek translation did not work as it breached the 200.000 bytes 'limit' for loading language files [FS#4536] (r22153)
This commit is contained in:
rubidium
2011-03-03 20:48:24 +00:00
parent 5552c0a7e9
commit 40f3583c54
7 changed files with 87 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf.cpp
View File

@@ -2455,6 +2455,7 @@ static ChangeInfoResult IgnoreIndustryProperty(int prop, ByteReader *buf)
buf->ReadWord();
break;
case 0x11:
case 0x1A:
case 0x1C:
case 0x1D:
@@ -2485,7 +2486,6 @@ static ChangeInfoResult IgnoreIndustryProperty(int prop, ByteReader *buf)
break;
}
case 0x11:
case 0x16:
for (byte j = 0; j < 3; j++) buf->ReadByte();
break;
@@ -5383,11 +5383,11 @@ static void ScanInfo(ByteReader *buf)
/* GRF IDs starting with 0xFF are reserved for internal TTDPatch use */
if (GB(grfid, 24, 8) == 0xFF) SetBit(_cur_grfconfig->flags, GCF_SYSTEM);
AddGRFTextToList(&_cur_grfconfig->name, 0x7F, grfid, name);
AddGRFTextToList(&_cur_grfconfig->name->text, 0x7F, grfid, name);
if (buf->HasData()) {
const char *info = buf->ReadString();
AddGRFTextToList(&_cur_grfconfig->info, 0x7F, grfid, info);
AddGRFTextToList(&_cur_grfconfig->info->text, 0x7F, grfid, info);
}
/* GLS_INFOSCAN only looks for the action 8, so we can skip the rest of the file */
@@ -6467,14 +6467,14 @@ static void TranslateGRFStrings(ByteReader *buf)
/** Callback function for 'INFO'->'NAME' to add a translation to the newgrf name. */
static bool ChangeGRFName(byte langid, const char *str)
{
AddGRFTextToList(&_cur_grfconfig->name, langid, _cur_grfconfig->ident.grfid, str);
AddGRFTextToList(&_cur_grfconfig->name->text, langid, _cur_grfconfig->ident.grfid, str);
return true;
}
/** Callback function for 'INFO'->'DESC' to add a translation to the newgrf description. */
static bool ChangeGRFDescription(byte langid, const char *str)
{
AddGRFTextToList(&_cur_grfconfig->info, langid, _cur_grfconfig->ident.grfid, str);
AddGRFTextToList(&_cur_grfconfig->info->text, langid, _cur_grfconfig->ident.grfid, str);
return true;
}