mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-23 12:14:11 +01:00
Code Issues Releases Wiki Activity

Codechange: Improve debug/error messages when reading baseset metadata.

Browse Source
This commit is contained in:
frosch
2025-04-30 10:14:16 +02:00
committed by frosch
parent 708e6a512d
commit d30fee4a99
3 changed files with 70 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gfxinit.cpp
View File

@@ -354,20 +354,21 @@ GraphicsSet::~GraphicsSet() = default;
bool GraphicsSet::FillSetDetails(const IniFile &ini, const std::string &path, const std::string &full_filename)
{
bool ret = this->BaseSet<GraphicsSet>::FillSetDetails(ini, path, full_filename, false);
if (ret) {
const IniGroup *metadata = ini.GetGroup("metadata");
assert(metadata != nullptr); /* ret can't be true if metadata isn't present. */
const IniItem *item;
if (!this->BaseSet<GraphicsSet>::FillSetDetails(ini, path, full_filename, false)) return false;
fetch_metadata("palette");
this->palette = ((*item->value)[0] == 'D' || (*item->value)[0] == 'd') ? PAL_DOS : PAL_WINDOWS;
const IniGroup *metadata = ini.GetGroup("metadata");
assert(metadata != nullptr); /* already checked by the inherited FillSetDetails. */
const IniItem *item;
/* Get optional blitter information. */
item = metadata->GetItem("blitter");
this->blitter = (item != nullptr && (*item->value)[0] == '3') ? BLT_32BPP : BLT_8BPP;
}
return ret;
item = this->GetMandatoryItem(full_filename, *metadata, "palette");
if (item == nullptr) return false;
this->palette = ((*item->value)[0] == 'D' || (*item->value)[0] == 'd') ? PAL_DOS : PAL_WINDOWS;
/* Get optional blitter information. */
item = metadata->GetItem("blitter");
this->blitter = (item != nullptr && (*item->value)[0] == '3') ? BLT_32BPP : BLT_8BPP;
return true;
}
/**