cpp/openttd-patchpack/source Changeset - r28059:72edd14954dc

Changeset - r28059:72edd14954dc

Parent rev.

Child rev.

[Not reviewed]

master

0 7 0

frosch - 14 months ago 2023-10-02 12:37:43
frosch@openttd.org

Add: store base graphics parameters in openttd.cfg.

7 files changed with 50 insertions and 0 deletions:

src/base_media_base.h

src/base_media_func.h

src/gfxinit.cpp

src/newgrf_config.cpp

src/newgrf_config.h

src/openttd.cpp

src/settings.cpp

0 comments (0 inline, 0 general)

src/base_media_base.h

➞

Show inline comments

@@ @@ -96,6 +96,7 @@ struct BaseSet { @@
+	}
 	bool FillSetDetails(const IniFile &ini, const std::string &path, const std::string &full_filename, bool allow_empty_filename = true);
 	void CopyCompatibleConfig([[maybe_unused]] const T &src) {}
 	/**
 	 * Get the description for the given ISO code.
@@ @@ -253,6 +254,7 @@ public: @@
 	bool FillSetDetails(const IniFile &ini, const std::string &path, const std::string &full_filename);
 	GRFConfig *GetExtraConfig() const { return this->extra_cfg.get(); }
 	GRFConfig &GetOrCreateExtraConfig() const;
 	void CopyCompatibleConfig(const GraphicsSet &src);
 	static MD5File::ChecksumResult CheckMD5(const MD5File *file, Subdirectory subdir);
 };
@@ @@ -264,6 +266,8 @@ public: @@
 	struct Ini {
 		std::string name;
 		uint32_t shortname;                 ///< unique key for base set
 		uint32_t extra_version;             ///< version of the extra GRF
 		std::vector<uint32_t> extra_params; ///< parameters for the extra GRF
 	};
 	static inline Ini ini_data;

src/base_media_func.h

➞

Show inline comments

@@ @@ -198,6 +198,9 @@ bool BaseMedia<Tbase_set>::AddFile(const @@
 				*prev = set;
 				set->next = duplicate->next;
 				/* Keep baseset configuration, if compatible */
 				set->CopyCompatibleConfig(*duplicate);
 				/* If the duplicate set is currently used (due to rescanning this can happen)
 				 * update the currently used set to the new one. This will 'lie' about the
 				 * version number until a new game is started which isn't a big problem */

src/gfxinit.cpp

➞

Show inline comments

@@ @@ -193,6 +193,7 @@ static void LoadSpriteTables() @@
 	/* Baseset extra graphics */
 	GRFConfig *extra = new GRFConfig(used_set->GetOrCreateExtraConfig());
 	if (extra->num_params == 0) extra->SetParameterDefaults();
 	ClrBit(extra->flags, GCF_INIT_ONLY);
 	extra->next = top;
@@ @@ -388,6 +389,15 @@ GRFConfig &GraphicsSet::GetOrCreateExtra @@
 	return *this->extra_cfg;
+}
 void GraphicsSet::CopyCompatibleConfig(const GraphicsSet &src)
+{
 	const GRFConfig *src_cfg = src.GetExtraConfig();
 	if (src_cfg == nullptr || src_cfg->num_params == 0) return;
 	GRFConfig &dest_cfg = this->GetOrCreateExtraConfig();
 	if (dest_cfg.IsCompatible(src_cfg->version)) return;
 	dest_cfg.CopyParams(*src_cfg);
+}
 /**
  * Calculate and check the MD5 hash of the supplied GRF.
  * @param file The file get the hash of.

src/newgrf_config.cpp

➞

Show inline comments

@@ @@ -66,6 +66,12 @@ GRFConfig::GRFConfig(const GRFConfig &co @@
+{
+}
 void GRFConfig::SetParams(const std::vector<uint32_t> &pars)
+{
 	this->num_params = static_cast<uint8_t>(std::min(this->param.size(), pars.size()));
 	std::copy(pars.begin(), pars.begin() + this->num_params, this->param.begin());
+}
 /**
  * Return whether this NewGRF can replace an older version of the same NewGRF.
  */

src/newgrf_config.h

➞

Show inline comments

@@ @@ -174,6 +174,7 @@ struct GRFConfig : ZeroedMemoryAllocator @@
 	struct GRFConfig *next; ///< NOSAVE: Next item in the linked list
 	bool IsCompatible(uint32_t old_version) const;
 	void SetParams(const std::vector<uint32_t> &pars);
 	void CopyParams(const GRFConfig &src);
 	std::optional<std::string> GetTextfile(TextfileType type) const;

src/openttd.cpp

➞

Show inline comments

@@ @@ -706,6 +706,12 @@ int openttd_main(int argc, char *argv[]) @@
 	} else if (BaseGraphics::ini_data.shortname != 0) {
 		graphics_set = BaseGraphics::ini_data.name;
 		valid_graphics_set = BaseGraphics::SetSetByShortname(BaseGraphics::ini_data.shortname);
 		if (valid_graphics_set && !BaseGraphics::ini_data.extra_params.empty()) {
 			GRFConfig &extra_cfg = BaseGraphics::GetUsedSet()->GetOrCreateExtraConfig();
 			if (extra_cfg.IsCompatible(BaseGraphics::ini_data.extra_version)) {
 				extra_cfg.SetParams(BaseGraphics::ini_data.extra_params);
+			}
+		}
 	} else if (!BaseGraphics::ini_data.name.empty()) {
 		graphics_set = BaseGraphics::ini_data.name;
 		valid_graphics_set = BaseGraphics::SetSetByName(BaseGraphics::ini_data.name);

src/settings.cpp

➞

Show inline comments

@@ @@ -999,6 +999,20 @@ static void GraphicsSetLoadConfig(IniFil @@
 		if (const IniItem *item = group->GetItem("shortname"); item != nullptr && item->value && item->value->size() == 8) {
 			BaseGraphics::ini_data.shortname = BSWAP32(std::strtoul(item->value->c_str(), nullptr, 16));
+		}
 		if (const IniItem *item = group->GetItem("extra_version"); item != nullptr && item->value) BaseGraphics::ini_data.extra_version = std::strtoul(item->value->c_str(), nullptr, 10);
 		if (const IniItem *item = group->GetItem("extra_params"); item != nullptr && item->value) {
 			auto &extra_params = BaseGraphics::ini_data.extra_params;
 			extra_params.resize(lengthof(GRFConfig::param));
 			int count = ParseIntList(item->value->c_str(), &extra_params.front(), extra_params.size());
 			if (count < 0) {
 				SetDParamStr(0, BaseGraphics::ini_data.name);
 				ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_ARRAY, WL_CRITICAL);
 				count = 0;
+			}
 			extra_params.resize(count);
+		}
+	}
+}
@@ @@ -1187,6 +1201,12 @@ static void GraphicsSetSaveConfig(IniFil @@
 	group.GetOrCreateItem("name").SetValue(used_set->name);
 	group.GetOrCreateItem("shortname").SetValue(fmt::format("{:08X}", BSWAP32(used_set->shortname)));
 	const GRFConfig *extra_cfg = used_set->GetExtraConfig();
 	if (extra_cfg != nullptr && extra_cfg->num_params > 0) {
 		group.GetOrCreateItem("extra_version").SetValue(fmt::format("{}", extra_cfg->version));
 		group.GetOrCreateItem("extra_params").SetValue(GRFBuildParamList(extra_cfg));
+	}
+}
 /* Save a GRF configuration to the given group name */

0 comments (0 inline, 0 general)