OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

let FileReader::Read return an opaque buffer instead of std::vector.

Browse source 
This can later allow returning a pointer to a static buffer from a cache without creating copies.
This commit is contained in:
Christoph Oelckers 2023-12-10 09:07:26 +01:00
commit fc84579319
12 changed files with 248 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/m_misc.cpp
View file

@ -98,7 +98,7 @@ void M_FindResponseFile (void)
else
{
char **argv;
std::vector<uint8_t> file;
FileSys::ResourceData file;
int argc = 0;
int size;
size_t argsize = 0;
@ -118,9 +118,8 @@ void M_FindResponseFile (void)
{
Printf ("Found response file %s!\n", Args->GetArg(i) + 1);
size = (int)fr.GetLength();
file = fr.Read (size);
file.push_back(0);
argsize = ParseCommandLine ((char*)file.data(), &argc, NULL);
file = fr.ReadPadded(1);
argsize = ParseCommandLine (file.string(), &argc, nullptr);
}
}
else
@ -132,7 +131,7 @@ void M_FindResponseFile (void)
{
argv = (char **)M_Malloc (argc*sizeof(char *) + argsize);
argv[0] = (char *)argv + argc*sizeof(char *);
ParseCommandLine ((char*)file.data(), NULL, argv);
ParseCommandLine (file.string(), nullptr, argv);
// Create a new argument vector
FArgs *newargs = new FArgs;