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/newgrf_commons.cpp | |
| parent | b6a0806948583a9551df6ae3601a7310e648207d (diff) | |
| download | openttd-6d6939f844783e4e2d6a844aa53e0e059303f2f3.tar.xz | |
(svn r20401) -Codechange: let HouseSpec use GRFFileProps
Diffstat (limited to 'src/newgrf_commons.cpp')
| -rw-r--r-- | src/newgrf_commons.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/newgrf_commons.cpp b/src/newgrf_commons.cpp index 977d2f8c1..23e891929 100644 --- a/src/newgrf_commons.cpp +++ b/src/newgrf_commons.cpp @@ -157,7 +157,7 @@ uint16 OverrideManagerBase::GetSubstituteID(uint16 entity_id) */ void HouseOverrideManager::SetEntitySpec(const HouseSpec *hs) { - HouseID house_id = this->AddEntityID(hs->local_id, hs->grffile->grfid, hs->substitute_id); + HouseID house_id = this->AddEntityID(hs->grf_prop.local_id, hs->grf_prop.grffile->grfid, hs->grf_prop.subst_id); if (house_id == invalid_ID) { grfmsg(1, "House.SetEntitySpec: Too many houses allocated. Ignoring."); @@ -170,9 +170,9 @@ void HouseOverrideManager::SetEntitySpec(const HouseSpec *hs) for (int i = 0; i != max_offset; i++) { HouseSpec *overridden_hs = HouseSpec::Get(i); - if (entity_overrides[i] != hs->local_id || grfid_overrides[i] != hs->grffile->grfid) continue; + if (entity_overrides[i] != hs->grf_prop.local_id || grfid_overrides[i] != hs->grf_prop.grffile->grfid) continue; - overridden_hs->override = house_id; + overridden_hs->grf_prop.override = house_id; entity_overrides[i] = invalid_ID; grfid_overrides[i] = 0; } |