dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-02-21 19:51:00 +00:00
parent c9ab460a03 e74069e4c2
commit 1c1d272b57
7 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/newgrf.cpp
View File

@@ -4135,6 +4135,7 @@ static ChangeInfoResult ObjectChangeInfo(uint id, int numinfo, int prop, const G
if (*ospec == nullptr) {
*ospec = CallocT<ObjectSpec>(1);
(*ospec)->views = 1; // Default for NewGRFs that don't set it.
(*ospec)->size = 0x11; // Default for NewGRFs that manage to not set it (1x1)
}
/* Swap classid because we read it in BE. */
@@ -4160,6 +4161,10 @@ static ChangeInfoResult ObjectChangeInfo(uint id, int numinfo, int prop, const G
case 0x0C: // Size
spec->size = buf->ReadByte();
if ((spec->size & 0xF0) == 0 || (spec->size & 0x0F) == 0) {
grfmsg(1, "ObjectChangeInfo: Invalid object size requested (%u) for object id %u. Ignoring.", spec->size, id + i);
spec->size = 0x11; // 1x1
}
break;
case 0x0D: // Build cost multipler