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

(svn r22633) -Fix: Implement variables 25 and 7F for railtypes.

release/1.2
frosch 2011-07-04 20:25:17 +00:00
parent 0d486446b8
commit d2b236802c
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/newgrf.cpp
View File

@ -4599,6 +4599,7 @@ static void RailTypeMapSpriteGroup(ByteReader *buf, uint8 idcount)
if (railtypes[i] != INVALID_RAILTYPE) { if (railtypes[i] != INVALID_RAILTYPE) {
RailtypeInfo *rti = &_railtypes[railtypes[i]]; RailtypeInfo *rti = &_railtypes[railtypes[i]];
rti->grffile[ctype] = _cur_grffile;
rti->group[ctype] = _cur_grffile->spritegroups[groupid]; rti->group[ctype] = _cur_grffile->spritegroups[groupid];
} }
} }

10
src/newgrf_railtype.cpp
View File

@ -67,7 +67,7 @@ static const SpriteGroup *RailTypeResolveReal(const ResolverObject *object, cons
return NULL; return NULL;
} }
static inline void NewRailTypeResolver(ResolverObject *res, TileIndex tile, TileContext context) static inline void NewRailTypeResolver(ResolverObject *res, TileIndex tile, TileContext context, const GRFFile *grffile)
{ {
res->GetRandomBits = &RailTypeGetRandomBits; res->GetRandomBits = &RailTypeGetRandomBits;
res->GetTriggers = &RailTypeGetTriggers; res->GetTriggers = &RailTypeGetTriggers;
@ -85,6 +85,8 @@ static inline void NewRailTypeResolver(ResolverObject *res, TileIndex tile, Tile
res->trigger = 0; res->trigger = 0;
res->reseed = 0; res->reseed = 0;
res->count = 0; res->count = 0;
res->grffile = grffile;
} }
/** /**
@ -104,7 +106,7 @@ SpriteID GetCustomRailSprite(const RailtypeInfo *rti, TileIndex tile, RailTypeSp
const SpriteGroup *group; const SpriteGroup *group;
ResolverObject object; ResolverObject object;
NewRailTypeResolver(&object, tile, context); NewRailTypeResolver(&object, tile, context, rti->grffile[rtsg]);
group = SpriteGroup::Resolve(rti->group[rtsg], &object); group = SpriteGroup::Resolve(rti->group[rtsg], &object);
if (group == NULL || group->GetNumResults() == 0) return 0; if (group == NULL || group->GetNumResults() == 0) return 0;
@ -140,5 +142,7 @@ uint8 GetReverseRailTypeTranslation(RailType railtype, const GRFFile *grffile)
*/ */
void GetRailTypeResolver(ResolverObject *ro, uint index) void GetRailTypeResolver(ResolverObject *ro, uint index)
{ {
NewRailTypeResolver(ro, index, TCX_NORMAL); /* There is no unique GRFFile for the tile. Multiple GRFs can define different parts of the railtype.
* However, currently the NewGRF Debug GUI does not display variables depending on the GRF (like 0x7F) anyway. */
NewRailTypeResolver(ro, index, TCX_NORMAL, NULL);
} }

5
src/rail.h
View File

@ -232,6 +232,11 @@ struct RailtypeInfo {
*/ */
byte sorting_order; byte sorting_order;
/**
* NewGRF providing the Action3 for the railtype. NULL if not available.
*/
const GRFFile *grffile[RTSG_END];
/** /**
* Sprite groups for resolving sprites * Sprite groups for resolving sprites
*/ */

4
src/table/railtypes.h
View File

@ -105,6 +105,7 @@ static const RailtypeInfo _original_railtypes[] = {
0 << 4 | 7, 0 << 4 | 7,
{ NULL }, { NULL },
{ NULL },
}, },
/** Electrified railway */ /** Electrified railway */
@ -197,6 +198,7 @@ static const RailtypeInfo _original_railtypes[] = {
1 << 4 | 7, 1 << 4 | 7,
{ NULL }, { NULL },
{ NULL },
}, },
/** Monorail */ /** Monorail */
@ -285,6 +287,7 @@ static const RailtypeInfo _original_railtypes[] = {
2 << 4 | 7, 2 << 4 | 7,
{ NULL }, { NULL },
{ NULL },
}, },
/** Maglev */ /** Maglev */
@ -373,6 +376,7 @@ static const RailtypeInfo _original_railtypes[] = {
3 << 4 | 7, 3 << 4 | 7,
{ NULL }, { NULL },
{ NULL },
}, },
}; };