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

Merge branch 'enhanced_viewport_overlay' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-03-11 22:21:39 +00:00
parent cb2077edd5 864d94d2c5
commit 385a2552e9
107 changed files with 395 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/newgrf_engine.cpp
View File

@@ -943,21 +943,6 @@ static uint32 VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *object,
return in_motion ? group->loaded[set] : group->loading[set];
}
/**
* Scope resolver of a single vehicle.
* @param ro Surrounding resolver.
* @param engine_type Engine type
* @param v %Vehicle being resolved.
* @param info_view Indicates if the item is being drawn in an info window.
*/
VehicleScopeResolver::VehicleScopeResolver(ResolverObject &ro, EngineID engine_type, const Vehicle *v, bool info_view)
: ScopeResolver(ro)
{
this->v = v;
this->self_type = engine_type;
this->info_view = info_view;
}
/**
* Get the grf file associated with an engine type.
* @param engine_type Engine to query.