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

(svn r27982) -Codechange: Reduce invocations of GetGlobalVariable. Speedup sprite resolving by about 3 percent.

release/1.8
frosch 2018-03-11 13:17:44 +00:00
parent db54db00df
commit 4fc178aebd
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/newgrf_spritegroup.cpp
View File

@ -60,11 +60,7 @@ RandomizedSpriteGroup::~RandomizedSpriteGroup()
static inline uint32 GetVariable(const ResolverObject &object, ScopeResolver *scope, byte variable, uint32 parameter, bool *available) static inline uint32 GetVariable(const ResolverObject &object, ScopeResolver *scope, byte variable, uint32 parameter, bool *available)
{ {
/* First handle variables common with Action7/9/D */
uint32 value; uint32 value;
if (GetGlobalVariable(variable, &value, object.grffile)) return value;
/* Non-common variable */
switch (variable) { switch (variable) {
case 0x0C: return object.callback; case 0x0C: return object.callback;
case 0x10: return object.callback_param1; case 0x10: return object.callback_param1;
@ -79,8 +75,11 @@ static inline uint32 GetVariable(const ResolverObject &object, ScopeResolver *sc
if (object.grffile == NULL) return 0; if (object.grffile == NULL) return 0;
return object.grffile->GetParam(parameter); return object.grffile->GetParam(parameter);
/* Not a common variable, so evaluate the feature specific variables */ default:
default: return scope->GetVariable(variable, parameter, available); /* First handle variables common with Action7/9/D */
if (variable < 0x40 && GetGlobalVariable(variable, &value, object.grffile)) return value;
/* Not a common variable, so evaluate the feature specific variables */
return scope->GetVariable(variable, parameter, available);
} }
} }