mirror of
https://github.com/OpenTTD/OpenTTD
synced 2026-01-24 20:54:08 +01:00
(svn r22152) [1.1] -Backport from trunk:
- Fix: Windows video driver crashed when it could not go to full screen at the resolution of the configuration file when starting OpenTTD [FS#4521] (r22149) - Fix: Do not run savegame conversion during SlNullPointers; the pointer might not be converted or be NULL at that point (r22146) - Fix: Some valid keycodes were ignored along with the invalid ones (r22142) - Fix: When commands need to invalidate windows, process these events asynchronously before the next redraw. Calling window code directly from command scope uses wrong _current_company and might issue nested DoCommands() which interfer with the running command [FS#4523] (r22141, r22140, r22135, r22134) - Fix: [NewGRF] Skipping only the invalid part of an action14 failed, the rest of the action was skipped instead (r22138)
This commit is contained in:
@@ -6727,6 +6727,8 @@ static bool ChangeGRFParamValueNames(ByteReader *buf)
|
||||
if (type != 'T' || id > _cur_parameter->max_value) {
|
||||
grfmsg(2, "StaticGRFInfo: all child nodes of 'INFO'->'PARA'->param_num->'VALU' should have type 't' and the value/bit number as id");
|
||||
if (!SkipUnknownInfo(buf, type)) return false;
|
||||
type = buf->ReadByte();
|
||||
continue;
|
||||
}
|
||||
|
||||
byte langid = buf->ReadByte();
|
||||
@@ -6770,7 +6772,9 @@ static bool HandleParameterInfo(ByteReader *buf)
|
||||
uint32 id = buf->ReadDWord();
|
||||
if (type != 'C' || id >= _cur_grfconfig->num_valid_params) {
|
||||
grfmsg(2, "StaticGRFInfo: all child nodes of 'INFO'->'PARA' should have type 'C' and their parameter number as id");
|
||||
return SkipUnknownInfo(buf, type);
|
||||
if (!SkipUnknownInfo(buf, type)) return false;
|
||||
type = buf->ReadByte();
|
||||
continue;
|
||||
}
|
||||
|
||||
if (id >= _cur_grfconfig->param_info.Length()) {
|
||||
|
||||
Reference in New Issue
Block a user