petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r13885) -Fix [FS#2168]: Var 0x7F is not feature-specific.

Browse Source
This commit is contained in:
frosch
2008-07-30 18:23:12 +00:00
parent 515b55c635
commit 93d0ca8731
14 changed files with 32 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/newgrf_canal.cpp
View File

@@ -71,7 +71,7 @@ static const SpriteGroup *CanalResolveReal(const ResolverObject *object, const S
}
static void NewCanalResolver(ResolverObject *res, TileIndex tile)
static void NewCanalResolver(ResolverObject *res, TileIndex tile, const GRFFile *grffile)
{
res->GetRandomBits = &CanalGetRandomBits;
res->GetTriggers = &CanalGetTriggers;
@@ -88,6 +88,7 @@ static void NewCanalResolver(ResolverObject *res, TileIndex tile)
res->trigger = 0;
res->reseed = 0;
res->count = 0;
res->grffile = grffile;
}
@@ -96,7 +97,7 @@ SpriteID GetCanalSprite(CanalFeature feature, TileIndex tile)
ResolverObject object;
const SpriteGroup *group;
NewCanalResolver(&object, tile);
NewCanalResolver(&object, tile, _water_feature[feature].grffile);
group = Resolve(_water_feature[feature].group, &object);
if (group == NULL || group->type != SGT_RESULT) return 0;