zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-25 05:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move function out of header due to compile errors on macOS

Browse source
This commit is contained in:
Christoph Oelckers 2018-02-22 13:46:29 +01:00
parent 04344505c0
commit 2c138d703d
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/resourcefiles/resourcefile.cpp
View file

@ -716,3 +716,24 @@ int FExternalLump::FillCache()
return 1;
}
bool FMemoryFile::Open(bool quiet)
{
FString name(ExtractFileBase(Filename));
FString fname(ExtractFileBase(Filename, true));
Lumps = new FUncompressedLump[1]; // must use array allocator
uppercopy(Lumps->Name, name);
Lumps->Name[8] = 0;
Lumps->FullName = fname;
Lumps->Owner = this;
Lumps->Position = 0;
Lumps->LumpSize = Reader->GetLength();
Lumps->Namespace = ns_global;
Lumps->Flags = 0;
Lumps->FullName = NULL;
NumLumps = 1;
return true;
}

21
src/resourcefiles/resourcefile.h
View file

@ -160,24 +160,7 @@ struct FMemoryFile : public FUncompressedFile
Reader = &mr;
}
bool Open(bool quiet)
{
FString name(ExtractFileBase(Filename));
FString fname(ExtractFileBase(Filename, true));
Lumps = new FUncompressedLump[1]; // must use array allocator
uppercopy(Lumps->Name, name);
Lumps->Name[8] = 0;
Lumps->FullName = fname;
Lumps->Owner = this;
Lumps->Position = 0;
Lumps->LumpSize = Reader->GetLength();
Lumps->Namespace = ns_global;
Lumps->Flags = 0;
Lumps->FullName = NULL;
NumLumps = 1;
return true;
}
bool Open(bool quiet);
};
@ -185,4 +168,4 @@ struct FMemoryFile : public FUncompressedFile
#endif
#endif