Apply quake rolling to opengl too, cv_actionmovie depends on cv_tilting

This commit is contained in:
James R committed 2020-09-27 23:02:04 -07:00
1 parent 9ccf2490fc
commit b69162e92d
3 files changed
+19 -14

No files matched your search

+1
View File
@@ -370,6 +370,7 @@ typedef struct player_s
//fixed_t bob;
angle_t viewrollangle;
angle_t tilt;
// Mouse aiming, where the guy is looking at!
// It is updated with cmd->aiming.
+18 -11
View File
@@ -8303,12 +8303,26 @@ DoABarrelRoll (player_t *player)
slope -= Quaketilt(player);
delta = (INT32)( slope - player->viewrollangle )/ 32;
delta = (INT32)( slope - player->tilt )/ 32;
if (delta)
player->viewrollangle += delta;
player->tilt += delta;
else
player->viewrollangle = slope;
player->tilt = slope;
if (cv_tilting.value)
{
player->viewrollangle = player->tilt;
if (cv_actionmovie.value)
{
player->viewrollangle += quake.roll;
}
}
else
{
player->viewrollangle = 0;
}
}
//
@@ -8860,14 +8874,7 @@ void P_PlayerThink(player_t *player)
K_KartPlayerThink(player, cmd); // SRB2kart
if (cv_tilting.value)
{
DoABarrelRoll(player);
}
else
{
player->viewrollangle = 0;
}
DoABarrelRoll(player);
/*
// Colormap verification
-3
View File
@@ -671,9 +671,6 @@ void R_CheckViewMorph(void)
fixed_t fisheye = cv_cam2_turnmultiplier.value; // temporary test value
#endif
if (cv_actionmovie.value)
rollangle += quake.roll;
rollangle >>= ANGLETOFINESHIFT;
rollangle = ((rollangle+2) & ~3) & FINEMASK; // Limit the distinct number of angles to reduce recalcs from angles changing a lot.