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

VarAction2: Support extended bytes for var 0x7E proc with more_action2_ids

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-03-07 22:27:24 +00:00
parent e061fa06fd
commit 0fc9223724
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/newgrf.cpp
View File

@@ -5687,14 +5687,8 @@ static const CallbackResultSpriteGroup *NewCallbackResultSpriteGroup(uint16 grou
return NewCallbackResultSpriteGroupNoTransform(result); return NewCallbackResultSpriteGroupNoTransform(result);
} }
/* Helper function to either create a callback or link to a previously static const SpriteGroup *GetGroupFromGroupIDNoCBResult(uint16 setid, byte type, uint16 groupid)
* defined spritegroup. */
static const SpriteGroup *GetGroupFromGroupID(uint16 setid, byte type, uint16 groupid)
{ {
if (HasBit(groupid, 15)) {
return NewCallbackResultSpriteGroup(groupid);
}
if ((size_t)groupid >= _cur.spritegroups.size() || _cur.spritegroups[groupid] == nullptr) { if ((size_t)groupid >= _cur.spritegroups.size() || _cur.spritegroups[groupid] == nullptr) {
grfmsg(1, "GetGroupFromGroupID(0x%04X:0x%02X): Groupid 0x%04X does not exist, leaving empty", setid, type, groupid); grfmsg(1, "GetGroupFromGroupID(0x%04X:0x%02X): Groupid 0x%04X does not exist, leaving empty", setid, type, groupid);
return nullptr; return nullptr;
@@ -5705,6 +5699,17 @@ static const SpriteGroup *GetGroupFromGroupID(uint16 setid, byte type, uint16 gr
return result; return result;
} }
/* Helper function to either create a callback or link to a previously
* defined spritegroup. */
static const SpriteGroup *GetGroupFromGroupID(uint16 setid, byte type, uint16 groupid)
{
if (HasBit(groupid, 15)) {
return NewCallbackResultSpriteGroup(groupid);
}
return GetGroupFromGroupIDNoCBResult(setid, type, groupid);
}
static const SpriteGroup *GetGroupByID(uint16 groupid) static const SpriteGroup *GetGroupByID(uint16 groupid)
{ {
if ((size_t)groupid >= _cur.spritegroups.size()) return nullptr; if ((size_t)groupid >= _cur.spritegroups.size()) return nullptr;
@@ -5865,7 +5870,7 @@ static void NewSpriteGroup(ByteReader *buf)
adjust.variable = buf->ReadByte(); adjust.variable = buf->ReadByte();
if (adjust.variable == 0x7E) { if (adjust.variable == 0x7E) {
/* Link subroutine group */ /* Link subroutine group */
adjust.subroutine = GetGroupFromGroupID(setid, type, buf->ReadByte()); adjust.subroutine = GetGroupFromGroupIDNoCBResult(setid, type, HasBit(_cur.grffile->observed_feature_tests, GFTOF_MORE_ACTION2_IDS) ? buf->ReadExtendedByte() : buf->ReadByte());
} else { } else {
adjust.parameter = IsInsideMM(adjust.variable, 0x60, 0x80) ? buf->ReadByte() : 0; adjust.parameter = IsInsideMM(adjust.variable, 0x60, 0x80) ? buf->ReadByte() : 0;
} }