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

Add several NewGRF variables to vehicle image callback whitelist

Browse Source 
Add vehicle flags to control cached image invalidation

Various refactorings
This commit is contained in:
Jonathan G Rennison
2020-08-25 01:26:44 +01:00
parent c82d372d54
commit 810bfd276e
45 changed files with 325 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf_generic.cpp
View File

@@ -42,7 +42,7 @@ struct GenericScopeResolver : public ScopeResolver {
{
}
uint32 GetVariable(byte variable, uint32 parameter, bool *available) const override;
uint32 GetVariable(byte variable, uint32 parameter, GetVariableExtra *extra) const override;
private:
bool ai_callback; ///< Callback comes from the AI.
@@ -121,7 +121,7 @@ void AddGenericCallback(uint8 feature, const GRFFile *file, const SpriteGroup *g
_gcl[feature].push_front(GenericCallback(file, group));
}
/* virtual */ uint32 GenericScopeResolver::GetVariable(byte variable, uint32 parameter, bool *available) const
/* virtual */ uint32 GenericScopeResolver::GetVariable(byte variable, uint32 parameter, GetVariableExtra *extra) const
{
if (this->ai_callback) {
switch (variable) {
@@ -143,7 +143,7 @@ void AddGenericCallback(uint8 feature, const GRFFile *file, const SpriteGroup *g
DEBUG(grf, 1, "Unhandled generic feature variable 0x%02X", variable);
*available = false;
extra->available = false;
return UINT_MAX;
}