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

6
src/common/engine/stringtable.cpp
View file

@ -63,8 +63,8 @@ void FStringTable::LoadStrings (const char *language)
{
auto lumpdata = fileSystem.ReadFile(lump);
if (!ParseLanguageCSV(lump, lumpdata.GetString(), lumpdata.GetSize()))
LoadLanguage (lump, lumpdata.GetString(), lumpdata.GetSize());
if (!ParseLanguageCSV(lump, lumpdata.string(), lumpdata.size()))
LoadLanguage (lump, lumpdata.string(), lumpdata.size());
}
UpdateLanguage(language);
allMacros.Clear();
@ -160,7 +160,7 @@ TArray<TArray<FString>> FStringTable::parseCSV(const char* buffer, size_t size)
bool FStringTable::readMacros(int lumpnum)
{
auto lumpdata = fileSystem.ReadFile(lumpnum);
auto data = parseCSV(lumpdata.GetString(), lumpdata.GetSize());
auto data = parseCSV(lumpdata.string(), lumpdata.size());
for (unsigned i = 1; i < data.Size(); i++)
{