AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-23 03:52:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

45 max pitch angle when direct aim is enabled (#2187)

Browse Source
This commit is contained in:
Roman Fomin 2025-02-07 01:18:58 +07:00 committed by GitHub
parent 1a8b2adbc0
commit 9e627cb2a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_mobj.c
View File

@ -48,11 +48,13 @@
#include "z_zone.h" #include "z_zone.h"
boolean direct_vertical_aiming, default_direct_vertical_aiming; boolean direct_vertical_aiming, default_direct_vertical_aiming;
int max_pitch_angle = 32 * ANG1;
void P_UpdateDirectVerticalAiming(void) void P_UpdateDirectVerticalAiming(void)
{ {
direct_vertical_aiming = (CRITICAL(default_direct_vertical_aiming) && direct_vertical_aiming = (CRITICAL(default_direct_vertical_aiming) &&
(mouselook || padlook)); (mouselook || padlook));
max_pitch_angle = direct_vertical_aiming ? ANG45 : 32 * ANG1;
} }
// //

1
src/p_mobj.h
View File

@ -420,6 +420,7 @@ extern int iquehead;
extern int iquetail; extern int iquetail;
extern boolean direct_vertical_aiming, default_direct_vertical_aiming; extern boolean direct_vertical_aiming, default_direct_vertical_aiming;
extern int max_pitch_angle;
void P_UpdateDirectVerticalAiming(void); void P_UpdateDirectVerticalAiming(void);
extern boolean checksight12; extern boolean checksight12;

2
src/p_user.c
View File

@ -250,7 +250,7 @@ void P_MovePlayer (player_t* player)
if (!menuactive && !demoplayback && !player->centering) if (!menuactive && !demoplayback && !player->centering)
{ {
player->pitch += cmd->pitch << FRACBITS; player->pitch += cmd->pitch << FRACBITS;
player->pitch = BETWEEN(-MAX_PITCH_ANGLE, MAX_PITCH_ANGLE, player->pitch); player->pitch = BETWEEN(-max_pitch_angle, max_pitch_angle, player->pitch);
player->slope = PlayerSlope(player); player->slope = PlayerSlope(player);
} }
} }

2
src/r_main.c
View File

@ -805,7 +805,7 @@ void R_SetupFrame (player_t *player)
if (use_localview && raw_input && !player->centering) if (use_localview && raw_input && !player->centering)
{ {
pitch = player->pitch + localview.pitch; pitch = player->pitch + localview.pitch;
pitch = BETWEEN(-MAX_PITCH_ANGLE, MAX_PITCH_ANGLE, pitch); pitch = BETWEEN(-max_pitch_angle, max_pitch_angle, pitch);
} }
else else
{ {

2
src/r_main.h
View File

@ -32,8 +32,6 @@ struct seg_s;
// POV related. // POV related.
// //
#define MAX_PITCH_ANGLE (32 * ANG1)
extern fixed_t viewcos; extern fixed_t viewcos;
extern fixed_t viewsin; extern fixed_t viewsin;
extern int viewwindowx; extern int viewwindowx;