Revise cvars, inverseslope is now the default

This commit is contained in:
James R 2020-01-26 21:07:04 -08:00
parent c82ac33c0c
commit 300d25116f
3 changed files with 16 additions and 5 deletions

View file

@ -132,10 +132,12 @@ extern camera_t camera[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_cam_dist[MAXSPLITSCREENPLAYERS], cv_cam_still[MAXSPLITSCREENPLAYERS], cv_cam_height[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_cam_speed[MAXSPLITSCREENPLAYERS], cv_cam_rotate[MAXSPLITSCREENPLAYERS];
extern fixed_t t_cam_dist[MAXSPLITSCREENPLAYERS], t_cam_height[MAXSPLITSCREENPLAYERS], t_cam_rotate[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_inverseslope;
extern consvar_t cv_slopeview;
extern consvar_t cv_quaketilt;
extern fixed_t t_cam_dist[MAXSPLITSCREENPLAYERS], t_cam_height[MAXSPLITSCREENPLAYERS], t_cam_rotate[MAXSPLITSCREENPLAYERS];
void P_AddPlayerScore(player_t *player, UINT32 amount);
void P_ResetCamera(player_t *player, camera_t *thiscam);
boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam);

View file

@ -2725,7 +2725,15 @@ consvar_t cv_cam_rotate[MAXSPLITSCREENPLAYERS] = {
{"cam4_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate4_OnChange, 0, NULL, NULL, 0, 0, NULL}
};
consvar_t cv_inverseslope = {"inverseslope", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t slopeview_cons_t[] =
{
{ 0, "Off" },
{ 1, "On" },
{ 2, "Inverse" },
{0}
};
consvar_t cv_slopeview = {"slopeview", "Off", CV_SAVE, slopeview_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_quaketilt = {"quaketilt", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
fixed_t t_cam_dist[MAXSPLITSCREENPLAYERS] = {-42,-42,-42,-42};
@ -4203,12 +4211,13 @@ DoABarrelRoll (player_t *player)
angle_t slope;
angle_t delta;
if (player->mo->standingslope)
if (cv_slopeview.value && player->mo->standingslope)
{
delta = ( player->mo->angle - player->mo->standingslope->xydirection );
slope = FixedMul(FINESINE (delta>>ANGLETOFINESHIFT),
player->mo->standingslope->zangle);
if (cv_inverseslope.value)
/* invert the screen tilt as if tilting the view instead */
if (cv_slopeview.value != 2)/* :james: mode */
slope = -slope;
}
else

View file

@ -1705,7 +1705,7 @@ void R_RegisterEngineStuff(void)
CV_RegisterVar(&cv_cam_rotate[i]);
}
CV_RegisterVar(&cv_inverseslope);
CV_RegisterVar(&cv_slopeview);
CV_RegisterVar(&cv_quaketilt);
CV_RegisterVar(&cv_showhud);