Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
cd1b5aabd7
1 changed files with 3 additions and 3 deletions
|
|
@ -141,7 +141,7 @@ This file contains:
|
||||||
Vector vecOrigin{};
|
Vector vecOrigin{};
|
||||||
QAngle angView{};
|
QAngle angView{};
|
||||||
TraceOptions traceOpts{};
|
TraceOptions traceOpts{};
|
||||||
traceOpts.InteractsWith = static_cast<uint64_t>(MASK_SHOT_FULL);
|
traceOpts.InteractsWith = static_cast<uint64_t>(MASK_SHOT_PHYSICS);
|
||||||
traceOpts.DrawBeam = 1;
|
traceOpts.DrawBeam = 1;
|
||||||
|
|
||||||
TraceResult traceResult{};
|
TraceResult traceResult{};
|
||||||
|
|
@ -189,7 +189,7 @@ public void DoTrace(CCSPlayerController player)
|
||||||
QAngle angles = player.PlayerPawn.Value!.EyeAngles;
|
QAngle angles = player.PlayerPawn.Value!.EyeAngles;
|
||||||
|
|
||||||
TraceOptions options = new(
|
TraceOptions options = new(
|
||||||
InteractionLayers.MASK_SHOT_FULL
|
InteractionLayers.MASK_SHOT_PHYSICS
|
||||||
);
|
);
|
||||||
|
|
||||||
if (CRayTrace.TraceShape(origin, angles, null, options, out TraceResult result))
|
if (CRayTrace.TraceShape(origin, angles, null, options, out TraceResult result))
|
||||||
|
|
@ -211,7 +211,7 @@ Due to C++ ABI differences:
|
||||||
| Linux (Itanium ABI) | 2 | 3 | 4 |
|
| Linux (Itanium ABI) | 2 | 3 | 4 |
|
||||||
| Windows (MSVC ABI) | 1 | 2 | 3 |
|
| Windows (MSVC ABI) | 1 | 2 | 3 |
|
||||||
|
|
||||||
`public/Example.cs` applies Itanium offsets by default.
|
`public/Example.cs` applies correct offsets by default.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue