OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- first stage of uncoupling the file system from the engine.

Browse source 
This replaces several FStrings and TArrays with std::string and std::vector.
This commit is contained in:
Christoph Oelckers 2023-08-18 22:46:31 +02:00
commit 5a32f98bde
9 changed files with 150 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/common/filesystem/file_directory.cpp
View file

@ -84,7 +84,7 @@ public:
//==========================================================================
FDirectory::FDirectory(const char * directory, bool nosubdirflag)
: FResourceFile(NULL), nosubdir(nosubdirflag)
: FResourceFile(""), nosubdir(nosubdirflag)
{
FString dirname;
@ -194,7 +194,7 @@ int FDirectory::AddDirectory(const char *dirpath, FileSystemMessageFunc Printf)
bool FDirectory::Open(LumpFilterInfo* filter, FileSystemMessageFunc Printf)
{
NumLumps = AddDirectory(FileName, Printf);
NumLumps = AddDirectory(FileName.c_str(), Printf);
PostProcessArchive(&Lumps[0], sizeof(FDirectoryLump), filter);
return true;
}
@ -213,11 +213,11 @@ void FDirectory::AddEntry(const char *fullpath, int size)
lump_p->mFullPath = fullpath;
// [mxd] Convert name to lowercase
FString name = fullpath + strlen(FileName);
name.ToLower();
std::string name = fullpath + FileName.length();
for (auto& c : name) c = tolower(c);
// The lump's name is only the part relative to the main directory
lump_p->LumpNameSetup(name);
lump_p->LumpNameSetup(name.c_str());
lump_p->LumpSize = size;
lump_p->Owner = this;
lump_p->Flags = 0;