From d9710559276830de3a98ba21aed35ff08b2c084b Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 30 Dec 2023 16:54:37 +0300 Subject: [PATCH] engine: move PARM_SKY_SPHERE handling out of engine to renderer, after all renderers might or might not support sky spheres --- engine/client/cl_render.c | 2 -- ref/gl/gl_context.c | 2 +- ref/soft/r_context.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/engine/client/cl_render.c b/engine/client/cl_render.c index bc9f1787..660f7531 100644 --- a/engine/client/cl_render.c +++ b/engine/client/cl_render.c @@ -142,8 +142,6 @@ intptr_t CL_RenderGetParm( const int parm, const int arg, const qboolean checkRe return 1; #endif return 0; - case PARM_SKY_SPHERE: - return FBitSet( world.flags, FWORLD_SKYSPHERE ) && !FBitSet( world.flags, FWORLD_CUSTOM_SKYBOX ); case PARAM_GAMEPAUSED: return cl.paused; case PARM_CLIENT_INGAME: diff --git a/ref/gl/gl_context.c b/ref/gl/gl_context.c index 356d23c6..dd665d90 100644 --- a/ref/gl/gl_context.c +++ b/ref/gl/gl_context.c @@ -236,7 +236,7 @@ static int GL_RefGetParm( int parm, int arg ) case PARM_STENCIL_ACTIVE: return glState.stencilEnabled; case PARM_SKY_SPHERE: - return ENGINE_GET_PARM_( parm, arg ) && !tr.fCustomSkybox; + return FBitSet( tr.world->flags, FWORLD_SKYSPHERE ) && !FBitSet( tr.world->flags, FWORLD_CUSTOM_SKYBOX ); default: return ENGINE_GET_PARM_( parm, arg ); } diff --git a/ref/soft/r_context.c b/ref/soft/r_context.c index a4cce9d3..cac75f82 100644 --- a/ref/soft/r_context.c +++ b/ref/soft/r_context.c @@ -171,7 +171,7 @@ static int GL_RefGetParm( int parm, int arg ) case PARM_STENCIL_ACTIVE: return 0; //glState.stencilEnabled; case PARM_SKY_SPHERE: - return ENGINE_GET_PARM_( parm, arg ) && !tr.fCustomSkybox; + return 0; // ref_soft doesn't support sky sphere default: return ENGINE_GET_PARM_( parm, arg ); }