team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Lets try enabling Z_EXT_PF_ONGROUND by default for a bit, lets see what explodes. 

Some warning/compile fixes.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5496 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-07-29 06:04:43 +00:00
parent 7ca727489a
commit 8612ca3437
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/Makefile
View File

@ -392,6 +392,7 @@ ifeq ($(FTE_TARGET),dos)
#at least from dos.
CC=i586-pc-msdosdjgpp-gcc
CXX=i586-pc-msdosdjgpp-g++
STRIP=i586-pc-msdosdjgpp-strip
CFLAGS+=-DNO_ZLIB
endif
@ -400,6 +401,7 @@ ifeq ($(FTE_TARGET),linux32)
FTE_TARGET=linux
CC=gcc -m32
CXX=g++ -m32
STRIP=strip
BITS=32
endif
ifeq ($(FTE_TARGET),linuxarmhf)
@ -407,12 +409,14 @@ ifeq ($(FTE_TARGET),linuxarmhf)
FTE_TARGET=linux
CC=arm-linux-gnueabihf-gcc -marm -march=armv6 -mfpu=vfp -mfloat-abi=hard
CXX=arm-linux-gnueabihf-g++ -marm -march=armv6 -mfpu=vfp -mfloat-abi=hard
STRIP=arm-linux-gnueabihf-strip
BITS=armhf
endif
ifeq ($(FTE_TARGET),linuxarm64)
FTE_TARGET=linux
CC=aarch64-linux-gnu-gcc
CXX=aarch64-linux-gnu-g++
STRIP=aarch64-linux-gnu-strip
BITS=arm64
USE_SPEEX=0 #fails to compile due to neon asm, I'm just going to disable it (will still soft-link).
endif
@ -424,9 +428,11 @@ ifeq ($(FTE_TARGET),linuxx32)
ifneq ($(shell which x86_64-linux-gnux32-gcc 2> /dev/null),)
CC=x86_64-linux-gnux32-gcc
CXX=x86_64-linux-gnux32-g++
STRIP=x86_64-linux-gnux32-strip
else
CC=gcc -mx32
CXX=g++ -mx32
STRIP=strip
endif
BITS=x32
endif
@ -434,6 +440,7 @@ ifeq ($(FTE_TARGET),linux64)
FTE_TARGET=linux
CC=gcc -m64
CXX=g++ -m64
STRIP=strip
BITS=64
endif
ifeq ($(FTE_TARGET),cygwin)

2
engine/client/cl_parse.c
View File

@ -2199,9 +2199,9 @@ static void CL_ParseChunkedDownload(qdownload_t *dl)
enum dlfailreason_e failreason;
if (flag == DLERR_REDIRECTFILE)
{
failreason = DLFAIL_REDIRECTED;
if (CL_AllowArbitaryDownload(dl->remotename, svname))
{
failreason = DLFAIL_REDIRECTED;
Con_Printf("Download of \"%s\" redirected to \"%s\"\n", dl->remotename, svname);
if (!strncmp(svname, "package/", 8))
{

4
engine/common/protocol.h
View File

@ -106,9 +106,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define Z_EXT_PF_SOLID (1<<8) //conflicts with many FTE extensions.
#ifdef QUAKESTATS
#define SERVER_SUPPORTED_Z_EXTENSIONS (Z_EXT_PM_TYPE|Z_EXT_PM_TYPE_NEW|Z_EXT_VIEWHEIGHT|Z_EXT_SERVERTIME|Z_EXT_PITCHLIMITS|Z_EXT_JOIN_OBSERVE/*|Z_EXT_PF_ONGROUND*/|Z_EXT_VWEP/*|Z_EXT_PF_SOLID*/)
#define SERVER_SUPPORTED_Z_EXTENSIONS (Z_EXT_PM_TYPE|Z_EXT_PM_TYPE_NEW|Z_EXT_VIEWHEIGHT|Z_EXT_SERVERTIME|Z_EXT_PITCHLIMITS|Z_EXT_JOIN_OBSERVE|Z_EXT_PF_ONGROUND|Z_EXT_VWEP|Z_EXT_PF_SOLID)
#else
#define SERVER_SUPPORTED_Z_EXTENSIONS (Z_EXT_PM_TYPE|Z_EXT_PM_TYPE_NEW|Z_EXT_PITCHLIMITS|Z_EXT_JOIN_OBSERVE/*|Z_EXT_PF_ONGROUND*/|Z_EXT_VWEP/*|Z_EXT_PF_SOLID*/)
#define SERVER_SUPPORTED_Z_EXTENSIONS (Z_EXT_PM_TYPE|Z_EXT_PM_TYPE_NEW|Z_EXT_PITCHLIMITS|Z_EXT_JOIN_OBSERVE|Z_EXT_PF_ONGROUND|Z_EXT_VWEP|Z_EXT_PF_SOLID)
#endif
#define CLIENT_SUPPORTED_Z_EXTENSIONS (SERVER_SUPPORTED_Z_EXTENSIONS|Z_EXT_PF_ONGROUND|Z_EXT_PF_SOLID)

4
engine/gl/gl_warp.c
View File

@ -124,7 +124,6 @@ void R_DrawFastSky(batch_t *batch)
//2) or if r_ignoreentpvs==1 we must mask depth and waste a whole load of batches drawing invisible ents in the sky
extern cvar_t r_ignoreentpvs;
void R_RenderScene (void);
qboolean R_DrawSkyroom(shader_t *skyshader)
{
float vmat[16];
@ -183,8 +182,7 @@ qboolean R_DrawSkyroom(shader_t *skyshader)
VectorCopy(r_refdef.vieworg, r_origin);
Surf_SetupFrame();
//FIXME: just call Surf_DrawWorld instead?
R_RenderScene();
Surf_DrawWorld ();
r_refdef = oldrefdef;

4
engine/vk/vk_backend.c
View File

@ -4690,7 +4690,7 @@ void VKBE_RT_Gen(struct vk_rendertarg *targ, uint32_t width, uint32_t height, qb
targ->restartinfo.clearValueCount = 3;
targ->depthcleared = true; //will be once its activated.
if (targ->width == width && targ->height == height && targ->q_colour.flags == flags && (!(targ->rpassflags&RP_MULTISAMPLE))==(targ->mscolour.image==NULL))
if (targ->width == width && targ->height == height && targ->q_colour.flags == flags && (!(targ->rpassflags&RP_MULTISAMPLE))==(targ->mscolour.image==VK_NULL_HANDLE))
{
if (clear || targ->firstuse)
targ->restartinfo.renderPass = VK_GetRenderPass(RP_FULLCLEAR|targ->rpassflags);
@ -4724,7 +4724,7 @@ void VKBE_RT_Gen(struct vk_rendertarg *targ, uint32_t width, uint32_t height, qb
if (width == 0 && height == 0)
{
targ->restartinfo.renderPass = NULL;
targ->restartinfo.renderPass = VK_NULL_HANDLE;
return; //destroyed
}
targ->restartinfo.renderPass = VK_GetRenderPass(RP_FULLCLEAR|targ->rpassflags);