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

(svn r15739) -Codechange: Expose GRF ID of engines in var action property 0x25.

release/1.0
peter1138 2009-03-16 08:03:50 +00:00
parent ce4744e1d6
commit 5df06384d3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf_engine.cpp
View File

@ -122,7 +122,8 @@ const GRFFile *GetEngineGRF(EngineID engine)
*/ */
uint32 GetEngineGRFID(EngineID engine) uint32 GetEngineGRFID(EngineID engine)
{ {
return GetEngineGRF(engine)->grfid; const GRFFile *file = GetEngineGRF(engine);
return file == NULL ? 0 : file->grfid;
} }
@ -500,6 +501,9 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by
/* Calculated vehicle parameters */ /* Calculated vehicle parameters */
switch (variable) { switch (variable) {
case 0x25: // Get engine GRF ID
return GetEngineGRFID(v->engine_type);
case 0x40: // Get length of consist case 0x40: // Get length of consist
if (!HasBit(v->cache_valid, 0)) { if (!HasBit(v->cache_valid, 0)) {
v->cached_var40 = PositionHelper(v, false); v->cached_var40 = PositionHelper(v, false);