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

Codechange: Make RoadScopeResolver constructor inlineable (#9780)

pull/9783/head
Joan Josep 2022-01-05 13:25:22 +01:00 committed by GitHub
parent 5777649ac4
commit 54ce5b28a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/newgrf_roadtype.cpp
View File

@ -73,19 +73,6 @@ uint32 RoadTypeResolverObject::GetDebugID() const
return this->roadtype_scope.rti->label;
}
/**
* Constructor of the roadtype scope resolvers.
* @param ro Surrounding resolver.
* @param tile %Tile containing the track. For track on a bridge this is the southern bridgehead.
* @param context Are we resolving sprites for the upper halftile, or on a bridge?
*/
RoadTypeScopeResolver::RoadTypeScopeResolver(ResolverObject &ro, const RoadTypeInfo *rti, TileIndex tile, TileContext context) : ScopeResolver(ro)
{
this->tile = tile;
this->context = context;
this->rti = rti;
}
/**
* Resolver object for road types.
* @param rti Roadtype. nullptr in NewGRF Inspect window.

12
src/newgrf_roadtype.h
View File

@ -20,7 +20,17 @@ struct RoadTypeScopeResolver : public ScopeResolver {
TileContext context; ///< Are we resolving sprites for the upper halftile, or on a bridge?
const RoadTypeInfo *rti;
RoadTypeScopeResolver(ResolverObject &ro, const RoadTypeInfo *rti, TileIndex tile, TileContext context);
/**
* Constructor of the roadtype scope resolvers.
* @param ro Surrounding resolver.
* @param rti Associated RoadTypeInfo.
* @param tile %Tile containing the track. For track on a bridge this is the southern bridgehead.
* @param context Are we resolving sprites for the upper halftile, or on a bridge?
*/
RoadTypeScopeResolver(ResolverObject &ro, const RoadTypeInfo *rti, TileIndex tile, TileContext context)
: ScopeResolver(ro), tile(tile), context(context), rti(rti)
{
}
/* virtual */ uint32 GetRandomBits() const;
/* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const;