zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-21 18:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

renamed things.

Browse source
This commit is contained in:
Christoph Oelckers 2023-12-10 12:06:52 +01:00
parent 96b3f1f5e0
commit 5c04185d5a
4 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/audio/music/i_soundfont.cpp
View file

@ -367,7 +367,7 @@ void FSoundFontManager::ProcessOneFile(const char* fn)
auto zip = FResourceFile::OpenResourceFile(fn, true);
if (zip != nullptr)
{
if (zip->LumpCount() > 1) // Anything with just one lump cannot possibly be a packed GUS patch set so skip it right away and simplify the lookup code
if (zip->EntryCount() > 1) // Anything with just one lump cannot possibly be a packed GUS patch set so skip it right away and simplify the lookup code
{
auto zipl = zip->FindEntry("timidity.cfg");
if (zipl >= 0)

1
src/common/filesystem/include/resourcefile.h
View file

@ -207,7 +207,6 @@ public:
// If this FResourceFile represents a directory, the Reader object is not usable so don't return it.
FileReader *GetContainerReader() { return Reader.isOpen()? &Reader : nullptr; }
const char* GetFileName() const { return FileName; }
[[deprecated]] uint32_t LumpCount() const { return NumLumps; }
uint32_t GetFirstEntry() const { return FirstLump; }
void SetFirstLump(uint32_t f) { FirstLump = f; }
const char* GetHash() const { return Hash; }

10
src/common/filesystem/source/file_ssi.cpp
View file

@ -46,7 +46,7 @@ class FSSIFile : public FUncompressedFile
{
public:
FSSIFile(const char * filename, FileReader &file, StringPool* sp);
bool Open(int version, int lumpcount, LumpFilterInfo* filter);
bool Open(int version, int EntryCount, LumpFilterInfo* filter);
};
@ -68,13 +68,13 @@ FSSIFile::FSSIFile(const char *filename, FileReader &file, StringPool* sp)
//
//==========================================================================
bool FSSIFile::Open(int version, int lumpcount, LumpFilterInfo*)
bool FSSIFile::Open(int version, int EntryCount, LumpFilterInfo*)
{
NumLumps = lumpcount*2;
Lumps.Resize(lumpcount*2);
NumLumps = EntryCount*2;
Lumps.Resize(EntryCount*2);
int32_t j = (version == 2 ? 267 : 254) + (lumpcount * 121);
int32_t j = (version == 2 ? 267 : 254) + (EntryCount * 121);
for (uint32_t i = 0; i < NumLumps; i+=2)
{
char fn[13];

12
src/common/filesystem/source/filesystem.cpp
View file

@ -404,12 +404,12 @@ void FileSystem::AddFile (const char *filename, FileReader *filer, LumpFilterInf
if (resfile != NULL)
{
if (Printf)
Printf(FSMessageLevel::Message, "adding %s, %d lumps\n", filename, resfile->LumpCount());
Printf(FSMessageLevel::Message, "adding %s, %d lumps\n", filename, resfile->EntryCount());
uint32_t lumpstart = (uint32_t)FileInfo.size();
resfile->SetFirstLump(lumpstart);
for (uint32_t i=0; i < resfile->LumpCount(); i++)
for (uint32_t i=0; i < resfile->EntryCount(); i++)
{
FResourceLump *lump = resfile->GetLump(i);
FileInfo.resize(FileInfo.size() + 1);
@ -419,7 +419,7 @@ void FileSystem::AddFile (const char *filename, FileReader *filer, LumpFilterInf
Files.push_back(resfile);
for (uint32_t i=0; i < resfile->LumpCount(); i++)
for (uint32_t i=0; i < resfile->EntryCount(); i++)
{
FResourceLump *lump = resfile->GetLump(i);
if (lump->Flags & LUMPF_EMBEDDED)
@ -454,7 +454,7 @@ void FileSystem::AddFile (const char *filename, FileReader *filer, LumpFilterInf
else
fprintf(hashfile, "file: %s, Directory structure\n", filename);
for (uint32_t i = 0; i < resfile->LumpCount(); i++)
for (uint32_t i = 0; i < resfile->EntryCount(); i++)
{
FResourceLump *lump = resfile->GetLump(i);
@ -1473,7 +1473,7 @@ int FileSystem::GetLastEntry (int rfnum) const noexcept
return 0;
}
return Files[rfnum]->GetFirstEntry() + Files[rfnum]->LumpCount() - 1;
return Files[rfnum]->GetFirstEntry() + Files[rfnum]->EntryCount() - 1;
}
//==========================================================================
@ -1488,7 +1488,7 @@ int FileSystem::GetEntryCount (int rfnum) const noexcept
return 0;
}
return Files[rfnum]->LumpCount();
return Files[rfnum]->EntryCount();
}