From 9991c8677d257aa94c131e4bce64124af051c594 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 28 Aug 2010 18:54:12 +0000 Subject: (svn r20663) -Codechange: add the GRF name to the tile info window --- src/object_cmd.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp index 8978fb9cd..a45903777 100644 --- a/src/object_cmd.cpp +++ b/src/object_cmd.cpp @@ -23,7 +23,6 @@ #include "window_func.h" #include "company_gui.h" #include "cheat_type.h" -#include "landscape_type.h" #include "object.h" #include "cargopacket.h" #include "sprite.h" @@ -31,6 +30,8 @@ #include "core/pool_func.hpp" #include "object_map.h" #include "object_base.h" +#include "newgrf.h" +#include "newgrf_config.h" #include "newgrf_object.h" #include "date_func.h" @@ -373,9 +374,14 @@ static void AddAcceptedCargo_Object(TileIndex tile, CargoArray &acceptance, uint static void GetTileDesc_Object(TileIndex tile, TileDesc *td) { - td->str = ObjectSpec::GetByTile(tile)->name; + const ObjectSpec *spec = ObjectSpec::GetByTile(tile); + td->str = spec->name; td->owner[0] = GetTileOwner(tile); td->build_date = Object::GetByTile(tile)->build_date; + + if (spec->grf_prop.grffile != NULL) { + td->grf = GetGRFConfig(spec->grf_prop.grffile->grfid)->GetName(); + } } static void TileLoop_Object(TileIndex tile) -- cgit v1.2.3-70-g09d2