zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Expose nextvoxid variable 

This allows game and defs to not overwrite each other's voxels.

git-svn-id: https://svn.eduke32.com/eduke32@8471 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/kenbuild/src/bstub.cpp
#	source/kenbuild/src/game.cpp
#	source/sw/src/bldscript.cpp
#	source/sw/src/jnstub.cpp
This commit is contained in:
hendricks266 2019-12-22 10:20:22 +00:00 committed by Christoph Oelckers
parent f03bc3656f
commit deec38c827
4 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/build/include/build.h
View File

@ -1116,6 +1116,7 @@ int32_t md_setmisc(int32_t modelid, float scale, int32_t shadeoff, float zadd, f
extern GrowArray<char *> g_clipMapFiles;
#endif
EXTERN int32_t nextvoxid;
EXTERN intptr_t voxoff[MAXVOXELS][MAXVOXMIPS]; // used in KenBuild
EXTERN int8_t voxreserve[(MAXVOXELS+7)>>3];
EXTERN int8_t voxrotate[(MAXVOXELS+7)>>3];

1
source/build/src/defs.cpp
View File

@ -130,7 +130,6 @@ enum scripttoken_t
};
static int32_t lastmodelid = -1, lastvoxid = -1, modelskin = -1, lastmodelskin = -1, seenframe = 0;
static int32_t nextvoxid = 0;
static char *faketilebuffer = NULL;
static int32_t faketilebuffersiz = 0;

1
source/sw/src/game.cpp
View File

@ -784,7 +784,6 @@ void COVERsetbrightness(int bright, unsigned char *pal)
static int firstnet = 0; // JBF
int nextvoxid = 0; // JBF
static void SW_FatalEngineError(void)

2
source/sw/src/scrip2.cpp
View File

@ -49,8 +49,6 @@ BEGIN_SW_NS
//#define COMPUTE_TOTALS 1
extern int nextvoxid; // JBF: in game.c
ParentalStruct aVoxelArray[MAXTILES];