Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-13 07:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
frosch 2014-02-07 22:55:33 +00:00
parent fa1d5bbddd
commit c8139ccb1d
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;
}
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 */
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 ?
return spec->grf_prop.local_id;
return spec->grf_prop.local_id | o->view << 16;
}
return 0xFFFE; // Defined in another grf file