Update to 12.0-beta1

This commit is contained in:
dP
2021-08-15 14:57:29 +03:00
parent ac7d3eba75
commit 9df4f2c4fc
666 changed files with 61302 additions and 20466 deletions

View File

@@ -63,8 +63,6 @@ struct GenericResolverObject : public ResolverObject {
}
}
const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
GrfSpecFeature GetFeature() const override
{
return (GrfSpecFeature)this->generic_scope.feature;
@@ -141,20 +139,12 @@ void AddGenericCallback(uint8 feature, const GRFFile *file, const SpriteGroup *g
}
}
DEBUG(grf, 1, "Unhandled generic feature variable 0x%02X", variable);
Debug(grf, 1, "Unhandled generic feature variable 0x{:02X}", variable);
*available = false;
return UINT_MAX;
}
/* virtual */ const SpriteGroup *GenericResolverObject::ResolveReal(const RealSpriteGroup *group) const
{
if (group->num_loaded == 0) return nullptr;
return group->loaded[0];
}
/**
* Generic resolver.
* @param ai_callback Callback comes from the AI.