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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	media/baseset/CMakeLists.txt
#	src/lang/croatian.txt
This commit is contained in:
Jonathan G Rennison
2022-01-09 23:52:08 +00:00
parent 579c71dd44 93e8d4871d
commit b2c6c3b07a
8 changed files with 107 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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, GetVariableExtra *extra) const;