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

(svn r26316) -Feature [FS#5696]: Extend object variable 0x60 to also return the view.

release/1.4
frosch 2014-02-07 22:55:33 +00:00
parent 2e598be48f
commit 50c6b2486b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/newgrf_object.cpp
View File

@ -158,7 +158,8 @@ static uint32 GetObjectIDAtOffset(TileIndex tile, uint32 cur_grfid)
return 0xFFFF; return 0xFFFF;
} }
const ObjectSpec *spec = ObjectSpec::GetByTile(tile); const Object *o = Object::GetByTile(tile);
const ObjectSpec *spec = ObjectSpec::Get(o->type);
/* Default objects have no associated NewGRF file */ /* Default objects have no associated NewGRF file */
if (spec->grf_prop.grffile == NULL) { if (spec->grf_prop.grffile == NULL) {
@ -166,7 +167,7 @@ static uint32 GetObjectIDAtOffset(TileIndex tile, uint32 cur_grfid)
} }
if (spec->grf_prop.grffile->grfid == cur_grfid) { // same object, same grf ? if (spec->grf_prop.grffile->grfid == cur_grfid) { // same object, same grf ?
return spec->grf_prop.local_id; return spec->grf_prop.local_id | o->view << 16;
} }
return 0xFFFE; // Defined in another grf file return 0xFFFE; // Defined in another grf file