zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-07 17:11:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

moved a few things out of the common code that should be defined privately.

Browse source
This commit is contained in:
Christoph Oelckers 2024-02-04 13:54:25 +01:00
parent d0a2713820
commit f1db369883
6 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/engine/namedef.h
View file

@ -87,9 +87,6 @@ xx(SoundSlot5)
xx(SoundSlot6) xx(SoundSlot6)
xx(SoundSlot7) xx(SoundSlot7)
// Actor properties
xx(BobPivot3D)
xx(LevelLocals) xx(LevelLocals)
xx(Level) xx(Level)

2
src/common/filesystem/source/files_decompress.cpp
View file

@ -980,7 +980,7 @@ bool OpenDecompressor(FileReader& self, FileReader &parent, FileReader::Size len
} }
dec->Length = length; dec->Length = length;
} }
if ((flags & DCF_CACHED)) if ((flags & (DCF_CACHED| DCF_SEEKABLE))) // the buffering reader does not seem to be stable, so cache it instead until we find out what's wrong.
{ {
// read everything into a MemoryArrayReader. // read everything into a MemoryArrayReader.
FileData data(nullptr, length); FileData data(nullptr, length);

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

@ -395,7 +395,7 @@ void FileSystem::AddFile (const char *filename, FileReader *filer, LumpFilterInf
std::string path = filename; std::string path = filename;
path += ':'; path += ':';
path += resfile->getName(i); path += resfile->getName(i);
auto embedded = resfile->GetEntryReader(i, READER_NEW, READERFLAG_SEEKABLE); auto embedded = resfile->GetEntryReader(i, READER_CACHED);
AddFile(path.c_str(), &embedded, filter, Printf, hashfile); AddFile(path.c_str(), &embedded, filter, Printf, hashfile);
} }
} }

2
src/common/rendering/hwrenderer/data/hw_cvars.h
View file

@ -54,5 +54,3 @@ EXTERN_CVAR(Int, gl_shadowmap_filter)
EXTERN_CVAR(Bool, gl_brightfog) EXTERN_CVAR(Bool, gl_brightfog)
EXTERN_CVAR(Bool, gl_lightadditivesurfaces) EXTERN_CVAR(Bool, gl_lightadditivesurfaces)
EXTERN_CVAR(Bool, gl_notexturefill) EXTERN_CVAR(Bool, gl_notexturefill)
EXTERN_CVAR(Bool, r_drawplayersprites)

2
src/common/utility/findfile.cpp
View file

@ -90,7 +90,7 @@ bool D_AddFile(std::vector<std::string>& wadfiles, const char* file, bool check,
closedir(d); closedir(d);
if (!found) if (!found)
{ {
Printf("Can't find file '%s' in '%s'\n", filename.GetChars(), basepath.GetChars()); //Printf("Can't find file '%s' in '%s'\n", filename.GetChars(), basepath.GetChars());
return false; return false;
} }
} }

3
src/namedef_custom.h
View file

@ -12,6 +12,9 @@ xx(BloodSplatter)
xx(AxeBlood) xx(AxeBlood)
xx(Spray) xx(Spray)
// Actor properties
xx(BobPivot3D)
// Invulnerability types // Invulnerability types
xx(Ghost) xx(Ghost)
xx(Reflective) xx(Reflective)