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

2
src/playsim/fragglescript/t_func.cpp
View file

@ -54,6 +54,8 @@
#include "s_music.h"
#include "texturemanager.h"
using namespace FileSys;
static FRandom pr_script("FScript");
// functions. FParser::SF_ means Script Function not, well.. heh, me

4
src/playsim/p_acs.cpp
View file

@ -1930,7 +1930,7 @@ void FBehaviorContainer::LoadDefaultModules ()
FScanner sc(lump);
while (sc.GetString())
{
int acslump = fileSystem.CheckNumForName (sc.String, ns_acslibrary);
int acslump = fileSystem.CheckNumForName (sc.String, FileSys::ns_acslibrary);
if (acslump >= 0)
{
LoadModule (acslump);
@ -2567,7 +2567,7 @@ bool FBehavior::Init(FLevelLocals *Level, int lumpnum, FileReader * fr, int len,
if (parse[i])
{
FBehavior *module = NULL;
int lump = fileSystem.CheckNumForName (&parse[i], ns_acslibrary);
int lump = fileSystem.CheckNumForName (&parse[i], FileSys::ns_acslibrary);
if (lump < 0)
{
Printf (TEXTCOLOR_RED "Could not find ACS library %s.\n", &parse[i]);

2
src/playsim/p_acs.h
View file

@ -38,12 +38,12 @@
#include "doomtype.h"
#include "dthinker.h"
#include "engineerrors.h"
#include "files.h"
#define LOCAL_SIZE 20
#define NUM_MAPVARS 128
class FFont;
class FileReader;
struct line_t;
class FSerializer;

8
src/playsim/p_user.cpp
View file

@ -828,16 +828,16 @@ static int SetupCrouchSprite(AActor *self, int crouchsprite)
FString normspritename = sprites[self->SpawnState->sprite].name;
FString crouchspritename = sprites[crouchsprite].name;
int spritenorm = fileSystem.CheckNumForName(normspritename + "A1", ns_sprites);
int spritenorm = fileSystem.CheckNumForName(normspritename + "A1", FileSys::ns_sprites);
if (spritenorm == -1)
{
spritenorm = fileSystem.CheckNumForName(normspritename + "A0", ns_sprites);
spritenorm = fileSystem.CheckNumForName(normspritename + "A0", FileSys::ns_sprites);
}
int spritecrouch = fileSystem.CheckNumForName(crouchspritename + "A1", ns_sprites);
int spritecrouch = fileSystem.CheckNumForName(crouchspritename + "A1", FileSys::ns_sprites);
if (spritecrouch == -1)
{
spritecrouch = fileSystem.CheckNumForName(crouchspritename + "A0", ns_sprites);
spritecrouch = fileSystem.CheckNumForName(crouchspritename + "A0", FileSys::ns_sprites);
}
if (spritenorm == -1 || spritecrouch == -1)