miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Remove virtual functions SpriteGroup::GetResult and GetNumResults. They are only implemented in and called via ResultSpriteGroup.

Browse Source
This commit is contained in:
frosch
2025-04-28 16:27:00 +02:00
committed by frosch
parent 010b944173
commit 8027e31f47
9 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf_station.cpp
View File

@@ -641,8 +641,8 @@ SpriteID GetCustomStationRelocation(const StationSpec *statspec, BaseStation *st
{
StationResolverObject object(statspec, st, tile, CBID_NO_CALLBACK, var10);
const auto *group = object.Resolve<ResultSpriteGroup>();
if (group == nullptr || group->GetNumResults() == 0) return 0;
return group->GetResult() - SPR_RAIL_PLATFORM_Y_FRONT;
if (group == nullptr || group->num_sprites == 0) return 0;
return group->sprite - SPR_RAIL_PLATFORM_Y_FRONT;
}
/**
@@ -662,9 +662,9 @@ SpriteID GetCustomStationFoundationRelocation(const StationSpec *statspec, BaseS
const auto *group = object.Resolve<ResultSpriteGroup>();
/* Note: SpriteGroup::Resolve zeroes all registers, so register 0x100 is initialised to 0. (compatibility) */
auto offset = GetRegister(0x100);
if (group == nullptr || group->GetNumResults() <= offset) return 0;
if (group == nullptr || group->num_sprites <= offset) return 0;
return group->GetResult() + offset;
return group->sprite + offset;
}