zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 04:01:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

adapt widget reader to new resource file API.

Browse source
This commit is contained in:
Christoph Oelckers 2024-01-02 17:05:13 +01:00
parent 779382a9ff
commit 2431d214e6
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/common/widgets/widgetresourcedata.cpp
View file

@ -14,28 +14,26 @@ void InitWidgetResources(const char* filename)
std::vector<uint8_t> 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<uint8_t> 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<uint8_t> 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<uint8_t> 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;
}