diff options
| author | frosch <frosch@openttd.org> | 2013-11-24 14:41:19 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2013-11-24 14:41:19 +0000 |
| commit | db894b0b3fa13413cdb76989cfcd2bb789243b77 (patch) | |
| tree | fd61e4df264893e0c41b0d989f3294c3b4909b63 /src/newgrf_railtype.cpp | |
| parent | 45a5aba8d55c68f54885c1de27684e8544e111d9 (diff) | |
| download | openttd-db894b0b3fa13413cdb76989cfcd2bb789243b77.tar.xz | |
(svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL.
Diffstat (limited to 'src/newgrf_railtype.cpp')
| -rw-r--r-- | src/newgrf_railtype.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/newgrf_railtype.cpp b/src/newgrf_railtype.cpp index 36ac7260a..de735193f 100644 --- a/src/newgrf_railtype.cpp +++ b/src/newgrf_railtype.cpp @@ -71,7 +71,7 @@ * @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? */ -RailTypeScopeResolver::RailTypeScopeResolver(ResolverObject *ro, TileIndex tile, TileContext context) : ScopeResolver(ro) +RailTypeScopeResolver::RailTypeScopeResolver(ResolverObject &ro, TileIndex tile, TileContext context) : ScopeResolver(ro) { this->tile = tile; this->context = context; @@ -86,7 +86,7 @@ RailTypeScopeResolver::RailTypeScopeResolver(ResolverObject *ro, TileIndex tile, * @param param2 Extra parameter (second parameter of the callback, except railtypes do not have callbacks). */ RailTypeResolverObject::RailTypeResolverObject(TileIndex tile, TileContext context, const GRFFile *grffile, uint32 param1, uint32 param2) - : ResolverObject(grffile, CBID_NO_CALLBACK, param1, param2), railtype_scope(this, tile, context) + : ResolverObject(grffile, CBID_NO_CALLBACK, param1, param2), railtype_scope(*this, tile, context) { } @@ -105,7 +105,7 @@ SpriteID GetCustomRailSprite(const RailtypeInfo *rti, TileIndex tile, RailTypeSp if (rti->group[rtsg] == NULL) return 0; RailTypeResolverObject object(tile, context, rti->grffile[rtsg]); - const SpriteGroup *group = SpriteGroup::Resolve(rti->group[rtsg], &object); + const SpriteGroup *group = SpriteGroup::Resolve(rti->group[rtsg], object); if (group == NULL || group->GetNumResults() == 0) return 0; return group->GetResult(); @@ -129,7 +129,7 @@ SpriteID GetCustomSignalSprite(const RailtypeInfo *rti, TileIndex tile, SignalTy uint32 param2 = (type << 16) | (var << 8) | state; RailTypeResolverObject object(tile, TCX_NORMAL, rti->grffile[RTSG_SIGNALS], param1, param2); - const SpriteGroup *group = SpriteGroup::Resolve(rti->group[RTSG_SIGNALS], &object); + const SpriteGroup *group = SpriteGroup::Resolve(rti->group[RTSG_SIGNALS], object); if (group == NULL || group->GetNumResults() == 0) return 0; return group->GetResult(); |