OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- got rid of the remaining persistent std::strings in the file system.

Browse source 
This also uses the string pool now.
This commit is contained in:
Christoph Oelckers 2023-08-22 20:06:15 +02:00
commit 94c9ee4593
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/common/filesystem/resourcefile.cpp
View file

@ -692,9 +692,10 @@ FUncompressedFile::FUncompressedFile(const char *filename, FileReader &r, String
//
//==========================================================================
FExternalLump::FExternalLump(const char *_filename, int filesize)
: Filename(_filename)
FExternalLump::FExternalLump(const char *_filename, int filesize, StringPool* stringpool)
{
FileName = stringpool->Strdup(_filename);
if (filesize == -1)
{
FileReader f;
@ -727,7 +728,7 @@ int FExternalLump::FillCache()
Cache = new char[LumpSize];
FileReader f;
if (f.OpenFile(Filename.c_str()))
if (f.OpenFile(FileName))
{
auto read = f.Read(Cache, LumpSize);
if (read != LumpSize)