gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r11248) -Fix[FS#1314]: The logic behind industry slot allocation was implying that the only condition an override could be placed in a slot is that there were no previous override.

Browse Source 
That is not exact: the slot must not have been occupied by an industry coming from a grf.
So now, tourist center is available if more then one grf is used
This commit is contained in:
belugas 2007-10-12 15:54:49 +00:00
parent 9934cb8a1c
commit e4fdc7ce51
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_commons.cpp
View File

@ -195,10 +195,10 @@ void IndustryOverrideManager::SetEntitySpec(IndustrySpec *inds)
if (ind_id == invalid_ID) { // not found? So this is the introduction of a new industry
/* Second step is dealing with the override. */
if (inds->grf_prop.override != invalid_ID && _industry_specs[inds->grf_prop.override].grf_prop.override == invalid_ID) {
if (inds->grf_prop.override != invalid_ID && _industry_specs[inds->grf_prop.override].grf_prop.grffile == NULL) {
/* this is an override, which means it will take the place of the industry it is
* designed to replace. Before we conclude that the override is allowed,
* we first need to verify that the slot is not holding another override
* we first need to verify that the slot is not holding another industry from a grf
* If it's the case,it will be considered as a normal substitute */
ind_id = inds->grf_prop.override;
} else {