OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- put the entire filesystem code into a namespace and created some subdirectories.

Browse source
This commit is contained in:
Christoph Oelckers 2023-08-22 21:20:28 +02:00
commit ebb71cebf1
108 changed files with 308 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/r_data/colormaps.cpp
View file

@ -104,11 +104,11 @@ void R_InitColormaps (bool allowCustomColormap)
for (uint32_t i = 0; i < NumLumps; i++)
{
if (fileSystem.GetFileNamespace(i) == ns_colormaps)
if (fileSystem.GetFileNamespace(i) == FileSys::ns_colormaps)
{
auto name = fileSystem.GetFileShortName(i);
if (fileSystem.CheckNumForName (name, ns_colormaps) == (int)i)
if (fileSystem.CheckNumForName (name, FileSys::ns_colormaps) == (int)i)
{
strncpy(cm.name, name, 8);
cm.blend = 0;

4
src/r_data/r_translate.cpp
View file

@ -430,7 +430,7 @@ static void R_CreatePlayerTranslation (float h, float s, float v, const FPlayerC
}
else
{
FileData translump = fileSystem.ReadFile(colorset->Lump);
auto translump = fileSystem.ReadFile(colorset->Lump);
auto trans = translump.GetBytes();
for (i = start; i <= end; ++i)
{
@ -727,7 +727,7 @@ void R_ParseTrnslate()
do
{
sc.MustGetToken(TK_StringConst);
int pallump = fileSystem.CheckNumForFullName(sc.String, true, ns_global);
int pallump = fileSystem.CheckNumForFullName(sc.String, true, FileSys::ns_global);
if (pallump >= 0) //
{
int start = 0;

10
src/r_data/sprites.cpp
View file

@ -349,7 +349,7 @@ void R_InitSpriteDefs ()
memset(vhashes.Data(), -1, sizeof(VHasher)*vmax);
for (i = 0; i < vmax; ++i)
{
if (fileSystem.GetFileNamespace(i) == ns_voxels)
if (fileSystem.GetFileNamespace(i) == FileSys::ns_voxels)
{
size_t namelen;
int spin;
@ -715,7 +715,7 @@ void R_InitSkins (void)
int lump = fileSystem.CheckNumForName (sc.String, Skins[i].namespc);
if (lump == -1)
{
lump = fileSystem.CheckNumForFullName (sc.String, true, ns_sounds);
lump = fileSystem.CheckNumForFullName (sc.String, true, FileSys::ns_sounds);
}
if (lump != -1)
{
@ -748,7 +748,7 @@ void R_InitSkins (void)
sndlumps[j] = fileSystem.CheckNumForName (sc.String, Skins[i].namespc);
if (sndlumps[j] == -1)
{ // Replacement not found, try finding it in the global namespace
sndlumps[j] = fileSystem.CheckNumForFullName (sc.String, true, ns_sounds);
sndlumps[j] = fileSystem.CheckNumForFullName (sc.String, true, FileSys::ns_sounds);
}
}
}
@ -946,7 +946,7 @@ CCMD (skins)
static void R_CreateSkinTranslation (const char *palname)
{
FileData lump = fileSystem.ReadFile (palname);
auto lump = fileSystem.ReadFile (palname);
auto otherPal = lump.GetBytes();
for (int i = 0; i < 256; ++i)
@ -1016,7 +1016,7 @@ void R_InitSprites ()
Skins[i].range0end = basetype->IntVar(NAME_ColorRangeEnd);
Skins[i].Scale = basetype->Scale;
Skins[i].sprite = basetype->SpawnState->sprite;
Skins[i].namespc = ns_global;
Skins[i].namespc = FileSys::ns_global;
PlayerClasses[i].Skins.Push (i);

2
src/r_data/v_palette.cpp
View file

@ -44,6 +44,8 @@
#include "m_png.h"
#include "v_colortables.h"
using namespace FileSys;
/* Current color blending values */
int BlendR, BlendG, BlendB, BlendA;

2
src/r_data/voxeldef.cpp
View file

@ -50,6 +50,8 @@
#include "g_level.h"
#include "r_data/sprites.h"
using namespace FileSys;
struct VoxelOptions
{
int DroppedSpin = 0;