diff --git a/src/p_user.c b/src/p_user.c index 7fc7a8f3..1e3b9ba5 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -232,7 +232,7 @@ void P_MovePlayer (player_t* player) if (!menuactive && !demoplayback) { - player->lookdir = BETWEEN(-LOOKDIRMIN * MLOOKUNIT, + player->lookdir = BETWEEN(-LOOKDIRMAX * MLOOKUNIT, LOOKDIRMAX * MLOOKUNIT, player->lookdir + cmd->lookdir); } diff --git a/src/r_data.h b/src/r_data.h index 6d098e4c..98c89b04 100644 --- a/src/r_data.h +++ b/src/r_data.h @@ -24,9 +24,8 @@ #include "r_defs.h" #include "r_state.h" -#define LOOKDIRMIN 110 // [crispy] -110, actually -#define LOOKDIRMAX 90 -#define LOOKDIRS (LOOKDIRMIN+1+LOOKDIRMAX) // [crispy] lookdir range: -110..0..90 +#define LOOKDIRMAX 100 +#define LOOKDIRS (2*LOOKDIRMAX+1) // [crispy] lookdir range: -100..100 #define MLOOKUNIT 8 // Retrieve column data for span blitting. diff --git a/src/r_main.c b/src/r_main.c index e065e628..610a7692 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -502,11 +502,11 @@ void R_ExecuteSetViewSize (void) for (j = 0; j < LOOKDIRS; j++) { // [crispy] re-generate lookup-table for yslope[] whenever "viewheight" or "hires" change - fixed_t dy = abs(((i-viewheight/2-(j-LOOKDIRMIN)*viewblocks/10)< LOOKDIRMAX) pitch = LOOKDIRMAX; - else if (pitch < -LOOKDIRMIN) - pitch = -LOOKDIRMIN; + else if (pitch < -LOOKDIRMAX) + pitch = -LOOKDIRMAX; // apply new yslope[] whenever "lookdir", "viewheight" or "hires" change tempCentery = viewheight/2 + pitch * viewblocks / 10; @@ -661,7 +661,7 @@ void R_SetupFrame (player_t *player) { centery = tempCentery; centeryfrac = centery << FRACBITS; - yslope = yslopes[LOOKDIRMIN + pitch]; + yslope = yslopes[LOOKDIRMAX + pitch]; } viewsin = finesine[viewangle>>ANGLETOFINESHIFT];