Skip to content

3D Ballistics Fixes #259

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

Merged
themrdemonized merged 11 commits into from
Jun 20, 2025
Merged

3D Ballistics Fixes #259

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7d7db78
Fire knife from camera
ProfLander Jun 17, 2025
57a1d95
Make `aimpos` authoritative over crosshair rotation
ProfLander Jun 17, 2025
5e83833
Remove redundant `aimpos` handling from `CHudManager`
ProfLander Jun 17, 2025
9a50f5f
Simplify `CActor::GetPick` implementation
ProfLander Jun 17, 2025
925446e
Apply weapon or device fire params, not both
ProfLander Jun 18, 2025
27709d0
Make weapon authoritative over firepos / aimpos
ProfLander Jun 18, 2025
305c7d5
Third-person firepos improvements
ProfLander Jun 18, 2025
5cc8a34
Fix incorrect `g_get_target_pos` output during weapon wall penetration
ProfLander Jun 18, 2025
af19565
Respect firepos and aimpos in `CHudItem`, per-crosshair settings outs…
ProfLander Jun 18, 2025
293d458
Set default weapon / device far crosshair size to 1
ProfLander Jun 18, 2025
61d95cb
Properly categorize non-weapon main hand items when drawing crosshairs
ProfLander Jun 18, 2025
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
Prev Previous commit
Next Next commit
Apply weapon or device fire params, not both
  • Loading branch information
@ProfLander
ProfLander committed Jun 18, 2025
commit 925446e5a250683442d53c0b4879cc8f3510fe58
6 changes: 3 additions & 3 deletions src/xrGame/Actor_Weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ void CActor::g_fireParams(const CHudItem* pHudItem, Fvector& fire_pos, Fvector&
SPickParam& pp = GetPick();

attachable_hud_item* item_0 = g_player_hud->attached_item(0);
attachable_hud_item* item_1 = g_player_hud->attached_item(1);

if (item_0)
item_0->m_parent_hud_item->g_fireParams(pp);

attachable_hud_item* item_1 = g_player_hud->attached_item(1);
if (item_1)
else if (item_1)
item_1->m_parent_hud_item->g_fireParams(pp);

fire_pos = pp.defs.start;
Expand Down