cpp/openttd-patchpack/source Changeset - r27979:37253e20ef1d

Changeset - r27979:37253e20ef1d

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 9 months ago 2023-10-01 13:21:57
frosch@openttd.org

Fix #8846: When upgrading NewGRF presets, copy NewGRF parameters only if the NewGRF are compatible. Otherwise reset to defaults.

3 files changed with 15 insertions and 2 deletions:

src/newgrf_config.cpp

src/newgrf_config.h

src/newgrf_gui.cpp

0 comments (0 inline, 0 general)

src/newgrf_config.cpp

➞

Show inline comments

@@ @@ -64,12 +64,20 @@ GRFConfig::GRFConfig(const GRFConfig &co @@
 	param_info(config.param_info),
 	has_param_defaults(config.has_param_defaults)
+{
+}
 /**
  * Return whether this NewGRF can replace an older version of the same NewGRF.
  */
 bool GRFConfig::IsCompatible(uint32_t old_version) const
+{
 	return this->min_loadable_version <= old_version && old_version <= this->version;
+}
 /**
  * Copy the parameter information from the \a src config.
  * @param src Source config.
  */
 void GRFConfig::CopyParams(const GRFConfig &src)
+{
 	this->num_params = src.num_params;
@@ @@ -682,13 +690,13 @@ const GRFConfig *FindGRFConfig(uint32_t @@
 		if (!c->ident.HasGrfIdentifier(grfid, md5sum)) continue;
 		/* return it, if the exact same newgrf is found, or if we do not care about finding "the best" */
 		if (md5sum != nullptr || mode == FGCM_ANY) return c;
 		/* Skip incompatible stuff, unless explicitly allowed */
 		if (mode != FGCM_NEWEST && HasBit(c->flags, GCF_INVALID)) continue;
 		/* check version compatibility */
-		if (mode == FGCM_COMPATIBLE && (c->version < desired_version || c->min_loadable_version > desired_version)) continue;
+		if (mode == FGCM_COMPATIBLE && !c->IsCompatible(desired_version)) continue;
 		/* remember the newest one as "the best" */
 		if (best == nullptr || c->version > best->version) best = c;
+	}
 	return best;
+}

src/newgrf_config.h

➞

Show inline comments

@@ @@ -170,12 +170,13 @@ struct GRFConfig : ZeroedMemoryAllocator @@
 	uint8_t palette; ///< GRFPalette, bitset
 	std::vector<std::optional<GRFParameterInfo>> param_info; ///< NOSAVE: extra information about the parameters
 	bool has_param_defaults; ///< NOSAVE: did this newgrf specify any defaults for it's parameters
 	struct GRFConfig *next; ///< NOSAVE: Next item in the linked list
 	bool IsCompatible(uint32_t old_version) const;
 	void CopyParams(const GRFConfig &src);
 	std::optional<std::string> GetTextfile(TextfileType type) const;
 	const char *GetName() const;
 	const char *GetDescription() const;
 	const char *GetURL() const;

src/newgrf_gui.cpp

➞

Show inline comments

@@ @@ -720,13 +720,17 @@ struct NewGRFWindow : public Window, New @@
 			if (iter == grfid_map.end() || iter->second->version >= a->version) continue;
 			GRFConfig **c = &this->actives;
 			while (*c != iter->second) c = &(*c)->next;
 			GRFConfig *d = new GRFConfig(*a);
 			d->next = (*c)->next;
 			d->CopyParams(**c);
 			if (d->IsCompatible((*c)->version)) {
 				d->CopyParams(**c);
 			} else {
 				d->SetParameterDefaults();
+			}
 			if (this->active_sel == *c) {
 				CloseWindowByClass(WC_GRF_PARAMETERS);
 				CloseWindowByClass(WC_TEXTFILE);
 				this->active_sel = nullptr;
+			}
 			delete *c;

0 comments (0 inline, 0 general)