mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Add: [NewGRF] Special value 0x7FFF for Action2 references specifying explicit 'callback/sprite-resolving failed'.

pull/14242/head
frosch 2025-04-28 21:18:55 +02:00 committed by frosch
parent b1cdf5024f
commit 9d32087236
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/newgrf/newgrf_act2.cpp
View File

@ -22,6 +22,8 @@
#include "../safeguards.h" #include "../safeguards.h"
constexpr uint16_t GROUPID_CALLBACK_FAILED = 0x7FFF; ///< Explicit "failure" result.
/** /**
* Map the colour modifiers of TTDPatch to those that Open is using. * Map the colour modifiers of TTDPatch to those that Open is using.
* @param grf_sprite Pointer to the structure been modified. * @param grf_sprite Pointer to the structure been modified.
@ -293,6 +295,7 @@ static const SpriteGroup *GetCallbackResultGroup(uint16_t value)
static const SpriteGroup *GetGroupFromGroupID(uint8_t setid, uint8_t type, uint16_t groupid) static const SpriteGroup *GetGroupFromGroupID(uint8_t setid, uint8_t type, uint16_t groupid)
{ {
if (HasBit(groupid, 15)) return GetCallbackResultGroup(groupid); if (HasBit(groupid, 15)) return GetCallbackResultGroup(groupid);
if (groupid == GROUPID_CALLBACK_FAILED) return nullptr;
if (groupid > MAX_SPRITEGROUP || _cur_gps.spritegroups[groupid] == nullptr) { if (groupid > MAX_SPRITEGROUP || _cur_gps.spritegroups[groupid] == nullptr) {
GrfMsg(1, "GetGroupFromGroupID(0x{:02X}:0x{:02X}): Groupid 0x{:04X} does not exist, leaving empty", setid, type, groupid); GrfMsg(1, "GetGroupFromGroupID(0x{:02X}:0x{:02X}): Groupid 0x{:04X} does not exist, leaving empty", setid, type, groupid);