thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove inverse slope option, merge quaketilt and slopeview into tilting cvar

Browse source
This commit is contained in:
James R 2020-09-24 19:54:30 -07:00
parent a24e3c4bd1
commit f0c024e9bd
3 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_local.h
View file

@ -132,9 +132,7 @@ 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_dist[MAXSPLITSCREENPLAYERS], cv_cam_still[MAXSPLITSCREENPLAYERS], cv_cam_height[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_cam_speed[MAXSPLITSCREENPLAYERS], cv_cam_rotate[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_cam_speed[MAXSPLITSCREENPLAYERS], cv_cam_rotate[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_inverseslope; extern consvar_t cv_tilting;
extern consvar_t cv_slopeview;
extern consvar_t cv_quaketilt;
extern consvar_t cv_actionmovie; extern consvar_t cv_actionmovie;
extern consvar_t cv_windowquake; extern consvar_t cv_windowquake;

31
src/p_user.c
View file

@ -2725,16 +2725,8 @@ consvar_t cv_cam_rotate[MAXSPLITSCREENPLAYERS] = {
{"cam4_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate4_OnChange, 0, NULL, NULL, 0, 0, NULL} {"cam4_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate4_OnChange, 0, NULL, NULL, 0, 0, NULL}
}; };
static CV_PossibleValue_t slopeview_cons_t[] = consvar_t cv_tilting = {"tilting", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
{
{ 0, "Off" },
{ 1, "On" },
{ 2, "Inverse" },
{0}
};
consvar_t cv_slopeview = {"slopeview", "On", 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};
consvar_t cv_actionmovie = {"actionmovie", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_actionmovie = {"actionmovie", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_windowquake = {"windowquake", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_windowquake = {"windowquake", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@ -4213,20 +4205,16 @@ DoABarrelRoll (player_t *player)
angle_t slope; angle_t slope;
angle_t delta; angle_t delta;
if (cv_slopeview.value && player->mo->standingslope) if (player->mo->standingslope)
{ {
delta = ( player->mo->angle - player->mo->standingslope->xydirection ); delta = ( player->mo->angle - player->mo->standingslope->xydirection );
slope = FixedMul(FINESINE (delta>>ANGLETOFINESHIFT), slope = -(FixedMul(FINESINE (delta>>ANGLETOFINESHIFT),
player->mo->standingslope->zangle); player->mo->standingslope->zangle));
/* invert the screen tilt as if tilting the view instead */
if (cv_slopeview.value != 2)/* :james: mode */
slope = -slope;
} }
else else
slope = 0; slope = 0;
if (cv_quaketilt.value) slope += Quaketilt(player);
slope += Quaketilt(player);
delta = (INT32)( slope - player->viewrollangle )/ 32; delta = (INT32)( slope - player->viewrollangle )/ 32;
@ -4611,7 +4599,14 @@ void P_PlayerThink(player_t *player)
K_KartPlayerThink(player, cmd); // SRB2kart K_KartPlayerThink(player, cmd); // SRB2kart
DoABarrelRoll(player); if (cv_tilting.value)
{
DoABarrelRoll(player);
}
else
{
player->viewrollangle = 0;
}
LUAh_PlayerThink(player); LUAh_PlayerThink(player);
} }

3
src/r_main.c
View file

@ -1708,8 +1708,7 @@ void R_RegisterEngineStuff(void)
CV_RegisterVar(&cv_cam_rotate[i]); CV_RegisterVar(&cv_cam_rotate[i]);
} }
CV_RegisterVar(&cv_slopeview); CV_RegisterVar(&cv_tilting);
CV_RegisterVar(&cv_quaketilt);
CV_RegisterVar(&cv_actionmovie); CV_RegisterVar(&cv_actionmovie);
CV_RegisterVar(&cv_windowquake); CV_RegisterVar(&cv_windowquake);