From aae3ca07c43858e39e4d6507aa47fd7f24db1b35 Mon Sep 17 00:00:00 2001 From: belugas Date: Thu, 4 Oct 2007 00:59:52 +0000 Subject: (svn r11198) -Fix: When industry override is not possible because it is already been overridden, mark the new candidate as not being an override --- src/newgrf_commons.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/newgrf_commons.cpp') diff --git a/src/newgrf_commons.cpp b/src/newgrf_commons.cpp index 173997d99..68269c643 100644 --- a/src/newgrf_commons.cpp +++ b/src/newgrf_commons.cpp @@ -188,7 +188,7 @@ uint16 IndustryOverrideManager::AddEntityID(byte grf_local_id, uint32 grfid, byt * checking what is available * @param inds Industryspec that comes from the grf decoding process */ -void IndustryOverrideManager::SetEntitySpec(const IndustrySpec *inds) +void IndustryOverrideManager::SetEntitySpec(IndustrySpec *inds) { /* First step : We need to find if this industry is already specified in the savegame data */ IndustryType ind_id = this->GetID(inds->grf_prop.local_id, inds->grf_prop.grffile->grfid); @@ -206,6 +206,7 @@ void IndustryOverrideManager::SetEntitySpec(const IndustrySpec *inds) * Or it is a simple substitute. * In both case, we need to find a free available slot */ ind_id = this->AddEntityID(inds->grf_prop.local_id, inds->grf_prop.grffile->grfid, inds->grf_prop.subst_id); + inds->grf_prop.override = invalid_ID; // make sure it will not be detected as overriden } } -- cgit v1.2.3-54-g00ecf