Merge branch 'hide-items' into 'master'

drawpickups command to hide collectible items

Closes #336

See merge request KartKrew/Kart!782
This commit is contained in:
Sal 2022-11-26 07:48:54 +00:00
commit a3d395c72f
3 changed files with 25 additions and 0 deletions

View file

@ -180,6 +180,8 @@ consvar_t cv_maxportals = CVAR_INIT ("maxportals", "2", CV_SAVE, maxportals_cons
consvar_t cv_renderstats = CVAR_INIT ("renderstats", "Off", 0, CV_OnOff, NULL);
consvar_t cv_drawpickups = CVAR_INIT ("drawpickups", "Yes", CV_CHEAT, CV_YesNo, NULL);
void SplitScreen_OnChange(void)
{
UINT8 i;
@ -1646,4 +1648,6 @@ void R_RegisterEngineStuff(void)
// Frame interpolation/uncapped
CV_RegisterVar(&cv_fpscap);
CV_RegisterVar(&cv_drawpickups);
}

View file

@ -117,6 +117,7 @@ extern consvar_t cv_drawdist, cv_drawdist_precip;
extern consvar_t cv_fov[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_skybox;
extern consvar_t cv_tailspickup;
extern consvar_t cv_drawpickups;
// Called by startup code.
void R_Init(void);

View file

@ -3443,6 +3443,26 @@ boolean R_ThingVisible (mobj_t *thing)
if (thing->sprite == SPR_NULL)
return false;
if (!cv_drawpickups.value)
{
switch (thing->type)
{
case MT_RING:
case MT_FLINGRING:
case MT_BLUESPHERE:
case MT_RANDOMITEM:
case MT_SPHEREBOX:
case MT_ITEMCAPSULE:
case MT_ITEMCAPSULE_PART:
case MT_BATTLECAPSULE:
case MT_BATTLECAPSULE_PIECE:
return false;
default:
break;
}
}
if (r_viewmobj && (thing == r_viewmobj || (r_viewmobj->player && r_viewmobj->player->followmobj == thing)))
return false;