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

Codechange: Deduplicate ResolveReal() for resolvers that don't use real sprite groups.

Browse Source 
This may change behaviour when multiple loading/loaded stages are provided, as the various copies checked in different orders, however only one result is expected in these cases anyway.
This commit is contained in:
Peter Nelson
2021-06-04 12:52:00 +01:00
committed by PeterN
parent c562b4c527
commit f1328db063
9 changed files with 3 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf_airport.cpp
View File

@@ -57,8 +57,6 @@ struct AirportResolverObject : public ResolverObject {
}
}
const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
GrfSpecFeature GetFeature() const override;
uint32 GetDebugID() const override;
};
@@ -219,16 +217,6 @@ void AirportOverrideManager::SetEntitySpec(AirportSpec *as)
return this->st->GetNewGRFVariable(this->ro, variable, parameter, available);
}
/* virtual */ const SpriteGroup *AirportResolverObject::ResolveReal(const RealSpriteGroup *group) const
{
/* Airport action 2s should always have only 1 "loaded" state, but some
* times things don't follow the spec... */
if (!group->loaded.empty()) return group->loaded[0];
if (!group->loading.empty()) return group->loading[0];
return nullptr;
}
GrfSpecFeature AirportResolverObject::GetFeature() const
{
return GSF_AIRPORTS;