Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always use critical struct for freeaim and jump #1088

Merged
merged 1 commit into from
Aug 24, 2023
Merged

Always use critical struct for freeaim and jump #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/doom/p_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//

Check notice on line 1 in src/doom/p_map.c

View workflow job for this annotation

GitHub Actions / cpp-linter (clang)

Run clang-format on src/doom/p_map.c 

File src/doom/p_map.c does not conform to Custom style guidelines. (lines 1333)
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005-2014 Simon Howard, Andrey Budko
//
Expand Down Expand Up @@ -1330,7 +1330,7 @@
if ((crispy->crosshair & ~CROSSHAIR_INTERCEPT) == CROSSHAIR_PROJECTED)
{
// [crispy] don't aim at Spectres
if (linetarget && !(linetarget->flags & MF_SHADOW) && (crispy->freeaim != FREEAIM_DIRECT))
if (linetarget && !(linetarget->flags & MF_SHADOW) && (critical->freeaim != FREEAIM_DIRECT))
P_LineAttack(t1, angle, distance, aimslope, INT_MIN);
else
// [crispy] double the auto aim distance
Expand Down
2 changes: 1 addition & 1 deletion src/doom/p_user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ void P_PlayerThink (player_t* player)
!player->jumpTics)
{
// [crispy] Hexen sets 9; Strife adds 8
player->mo->momz = (7 + crispy->jump) * FRACUNIT;
player->mo->momz = (7 + critical->jump) * FRACUNIT;
player->jumpTics = 18;
// [NS] Jump sound.
S_StartSoundOptional(player->mo, sfx_pljump, -1);
Expand Down
Loading