OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

merge FileData and ResourceData.

Browse source
This commit is contained in:
Christoph Oelckers 2023-12-10 22:30:54 +01:00
commit fe106d9bfe
38 changed files with 77 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/common/utility/palette.cpp
View file

@ -681,8 +681,8 @@ FString V_GetColorStringByName(const char* name, FScriptPosition* sc)
}
auto rgbNames = fileSystem.ReadFile(rgblump);
rgb = rgbNames.GetString();
rgbEnd = rgb + rgbNames.GetSize();
rgb = rgbNames.string();
rgbEnd = rgb + rgbNames.size();
step = 0;
namelen = strlen(name);
@ -930,11 +930,11 @@ int ReadPalette(int lumpnum, uint8_t* buffer)
return 0;
}
auto lump = fileSystem.ReadFile(lumpnum);
auto lumpmem = lump.GetBytes();
auto lumpmem = lump.bytes();
memset(buffer, 0, 768);
FileReader fr;
fr.OpenMemory(lumpmem, lump.GetSize());
fr.OpenMemory(lumpmem, lump.size());
auto png = M_VerifyPNG(fr);
if (png)
{
@ -964,7 +964,7 @@ int ReadPalette(int lumpnum, uint8_t* buffer)
{
FScanner sc;
sc.OpenMem(fileSystem.GetFileFullName(lumpnum), (char*)lumpmem, int(lump.GetSize()));
sc.OpenMem(fileSystem.GetFileFullName(lumpnum), (char*)lumpmem, int(lump.size()));
sc.MustGetString();
sc.MustGetNumber(); // version - ignore
sc.MustGetNumber();
@ -982,7 +982,7 @@ int ReadPalette(int lumpnum, uint8_t* buffer)
}
else
{
memcpy(buffer, lumpmem, min<size_t>(768, lump.GetSize()));
memcpy(buffer, lumpmem, min<size_t>(768, lump.size()));
return 256;
}
}