diff options
| author | rubidium <rubidium@openttd.org> | 2010-08-07 21:03:38 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-08-07 21:03:38 +0000 |
| commit | 6d6939f844783e4e2d6a844aa53e0e059303f2f3 (patch) | |
| tree | b791746f1126218037335373cbd09ee228b9ac69 /src/table | |
| parent | b6a0806948583a9551df6ae3601a7310e648207d (diff) | |
| download | openttd-6d6939f844783e4e2d6a844aa53e0e059303f2f3.tar.xz | |
(svn r20401) -Codechange: let HouseSpec use GRFFileProps
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/newgrf_debug_data.h | 2 | ||||
| -rw-r--r-- | src/table/town_land.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/table/newgrf_debug_data.h b/src/table/newgrf_debug_data.h index 7037ea1b0..4b8fe1b47 100644 --- a/src/table/newgrf_debug_data.h +++ b/src/table/newgrf_debug_data.h @@ -180,7 +180,7 @@ static const NIVariable _niv_house[] = { }; class NIHHouse : public NIHelper { - bool IsInspectable(uint index) const { return HouseSpec::Get(GetHouseType(index))->grffile != NULL; } + bool IsInspectable(uint index) const { return HouseSpec::Get(GetHouseType(index))->grf_prop.grffile != NULL; } uint GetParent(uint index) const { return GetInspectWindowNumber(GSF_FAKE_TOWNS, GetTownIndex(index)); } const void *GetInstance(uint index)const { return NULL; } const void *GetSpec(uint index) const { return HouseSpec::Get(GetHouseType(index)); } diff --git a/src/table/town_land.h b/src/table/town_land.h index 788b08531..713c35013 100644 --- a/src/table/town_land.h +++ b/src/table/town_land.h @@ -1813,7 +1813,7 @@ assert_compile(lengthof(_town_draw_tile_data) == (NEW_HOUSE_OFFSET) * 4 * 4); */ #define MS(mnd, mxd, p, rc, bn, rr, mg, ca1, ca2, ca3, bf, ba, cg1, cg2, cg3) \ {mnd, mxd, p, rc, bn, rr, mg, {ca1, ca2, ca3}, {cg1, cg2, cg3}, bf, ba, true, \ - 0, NULL, INVALID_HOUSE_ID, 0, {0, 0, 0, 0}, 16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, 0, 2, 0, 0, 0, NULL} + GRFFileProps(INVALID_HOUSE_ID), 0, {0, 0, 0, 0}, 16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, 0, 2, 0, 0} /** House specifications from original data */ static const HouseSpec _original_house_specs[] = { /** |