From 86234253a53834aec953376282ef6a849ee173b9 Mon Sep 17 00:00:00 2001 From: planetmaker Date: Thu, 18 Aug 2011 14:08:51 +0000 Subject: [PATCH] (svn r22757) -Fix [FS#4730]: [NewGRF] Invalid memory access when querying the grfID of the default objects --- src/newgrf_object.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/newgrf_object.cpp b/src/newgrf_object.cpp index 6582e8eca4..41735b7fad 100644 --- a/src/newgrf_object.cpp +++ b/src/newgrf_object.cpp @@ -140,6 +140,11 @@ static uint32 GetObjectIDAtOffset(TileIndex tile, uint32 cur_grfid) const ObjectSpec *spec = ObjectSpec::GetByTile(tile); + /* Default objects have no associated NewGRF file */ + if (spec->grf_prop.grffile == NULL) { + return 0xFFFE; // Defined in another grf file + } + if (spec->grf_prop.grffile->grfid == cur_grfid) { // same object, same grf ? return spec->grf_prop.local_id; }