From 2431d214e60cc48d167830e15689a5eae5ce9ead Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 2 Jan 2024 17:05:13 +0100 Subject: [PATCH] adapt widget reader to new resource file API. --- src/common/widgets/widgetresourcedata.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/common/widgets/widgetresourcedata.cpp b/src/common/widgets/widgetresourcedata.cpp index 207e0eb29..d2e468a44 100644 --- a/src/common/widgets/widgetresourcedata.cpp +++ b/src/common/widgets/widgetresourcedata.cpp @@ -14,28 +14,26 @@ void InitWidgetResources(const char* filename) std::vector LoadWidgetFontData(const std::string& name) { - auto lump = WidgetResources->FindLump("widgets/poppins/poppins-regular.ttf"); - if (!lump) + auto lump = WidgetResources->FindEntry("widgets/poppins/poppins-regular.ttf"); + if (lump == -1) I_FatalError("Unable to find %s", name.c_str()); - auto data = lump->Lock(); + auto reader = WidgetResources->GetEntryReader(lump, FileSys::READER_SHARED); std::vector buffer; - buffer.resize(lump->Size()); - memcpy(buffer.data(), data, buffer.size()); - lump->Unlock(); + buffer.resize(reader.GetLength()); + reader.Read(buffer.data(), buffer.size()); return buffer; } std::vector LoadWidgetImageData(const std::string& name) { - auto lump = WidgetResources->FindLump(name.c_str()); - if (!lump) + auto lump = WidgetResources->FindEntry(name.c_str()); + if (lump == -1) I_FatalError("Unable to find %s", name.c_str()); - auto data = lump->Lock(); + auto reader = WidgetResources->GetEntryReader(lump, FileSys::READER_SHARED); std::vector buffer; - buffer.resize(lump->Size()); - memcpy(buffer.data(), data, buffer.size()); - lump->Unlock(); + buffer.resize(reader.GetLength()); + reader.Read(buffer.data(), buffer.size()); return buffer; }