Changeset - r22169:671a08e8e50e
[Not reviewed]
master
0 2 0
frosch - 9 years ago 2015-07-26 12:25:37
frosch@openttd.org
(svn r27342) -Add: Optionally return the number of sprites in the spriteset from GetCustomRailSprite.
2 files changed with 5 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/newgrf_railtype.cpp
Show inline comments
 
@@ -100,9 +100,10 @@ RailTypeResolverObject::RailTypeResolver
 
 * @param tile The tile to get the sprite for.
 
 * @param rtsg The type of sprite to draw.
 
 * @param content Where are we drawing the tile?
 
 * @param [out] num_results If not NULL, return the number of sprites in the spriteset.
 
 * @return The sprite to draw.
 
 */
 
SpriteID GetCustomRailSprite(const RailtypeInfo *rti, TileIndex tile, RailTypeSpriteGroup rtsg, TileContext context)
 
SpriteID GetCustomRailSprite(const RailtypeInfo *rti, TileIndex tile, RailTypeSpriteGroup rtsg, TileContext context, uint *num_results)
 
{
 
	assert(rtsg < RTSG_END);
 

	
 
@@ -112,6 +113,8 @@ SpriteID GetCustomRailSprite(const Railt
 
	const SpriteGroup *group = object.Resolve();
 
	if (group == NULL || group->GetNumResults() == 0) return 0;
 

	
 
	if (num_results) *num_results = group->GetNumResults();
 

	
 
	return group->GetResult();
 
}
 

	
src/newgrf_railtype.h
Show inline comments
 
@@ -44,7 +44,7 @@ struct RailTypeResolverObject : public R
 
	/* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
 
};
 

	
 
SpriteID GetCustomRailSprite(const RailtypeInfo *rti, TileIndex tile, RailTypeSpriteGroup rtsg, TileContext context = TCX_NORMAL);
 
SpriteID GetCustomRailSprite(const RailtypeInfo *rti, TileIndex tile, RailTypeSpriteGroup rtsg, TileContext context = TCX_NORMAL, uint *num_results = NULL);
 
SpriteID GetCustomSignalSprite(const RailtypeInfo *rti, TileIndex tile, SignalType type, SignalVariant var, SignalState state, bool gui = false);
 

	
 
uint8 GetReverseRailTypeTranslation(RailType railtype, const GRFFile *grffile);
0 comments (0 inline, 0 general)