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

8
src/common/filesystem/file_whres.cpp
View file

@ -35,6 +35,7 @@
*/
#include "resourcefile.h"
#include "fs_stringpool.h"
#include "fs_swap.h"
using namespace fs_private;
@ -47,7 +48,7 @@ using namespace fs_private;
class FWHResFile : public FUncompressedFile
{
std::string basename;
const char* BaseName;
public:
FWHResFile(const char * filename, FileReader &file, StringPool* sp);
bool Open(LumpFilterInfo* filter);
@ -63,7 +64,7 @@ public:
FWHResFile::FWHResFile(const char *filename, FileReader &file, StringPool* sp)
: FUncompressedFile(filename, file, sp)
{
basename = ExtractBaseName(filename, false);
BaseName = stringpool->Strdup(ExtractBaseName(filename, false).c_str());
}
//==========================================================================
@ -91,7 +92,8 @@ bool FWHResFile::Open(LumpFilterInfo*)
if (length == 0) break;
char num[5];
snprintf(num, 5, "/%04d", k);
std::string synthname = basename + num;
std::string synthname = BaseName;
synthname += num;
Lumps[i].LumpNameSetup(synthname.c_str(), stringpool);
Lumps[i].Owner = this;
Lumps[i].Position = offset;