cpp/openttd-patchpack/source Changeset - r7714:c4514ddc8ddb

Changeset - r7714:c4514ddc8ddb

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

belugas - 17 years ago 2007-10-12 15:54:49
belugas@openttd.org

(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.
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

1 file changed with 2 insertions and 2 deletions:

src/newgrf_commons.cpp

0 comments (0 inline, 0 general)

src/newgrf_commons.cpp

➞

Show inline comments

@@ @@ -195,10 +195,10 @@ void IndustryOverrideManager::SetEntityS @@
 	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 {

0 comments (0 inline, 0 general)