teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-21 19:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Proper 6DoF for Flechette alt-fire

Browse source
This commit is contained in:
Simon 2023-05-29 08:03:17 +01:00
parent b074d1cbf6
commit 3116c5296c
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Projects/Android/jni/OpenJK/code/game/wp_flechette.cpp
View file

@ -55,17 +55,19 @@ static void WP_FlechetteMainFire( gentity_t *ent )
// damage *= 2; // damage *= 2;
// } // }
vec3_t a;
if ( BG_UseVRPosition(ent))
{
BG_CalculateVRWeaponPosition(muzzle, a);
}
else {
vectoangles(forwardVec, a);
}
for ( int i = 0; i < FLECHETTE_SHOTS; i++ ) for ( int i = 0; i < FLECHETTE_SHOTS; i++ )
{ {
vec3_t angs; vec3_t angs;
if ( BG_UseVRPosition(ent)) VectorCopy(a, angs);
{
BG_CalculateVRWeaponPosition(muzzle, angs);
}
else {
vectoangles(forwardVec, angs);
}
if ( i == 0 && ent->s.number == 0 ) if ( i == 0 && ent->s.number == 0 )
{ {
// do nothing on the first shot for the player, this one will hit the crosshairs // do nothing on the first shot for the player, this one will hit the crosshairs
@ -263,8 +265,14 @@ static void WP_FlechetteAltFire( gentity_t *self )
{ {
vec3_t dir, fwd, start, angs; vec3_t dir, fwd, start, angs;
vectoangles( forwardVec, angs ); if ( BG_UseVRPosition(self))
VectorCopy( muzzle, start ); {
BG_CalculateVRWeaponPosition(start, angs);
}
else {
vectoangles( forwardVec, angs );
VectorCopy( muzzle, start );
}
WP_TraceSetStart( self, start, vec3_origin, vec3_origin );//make sure our start point isn't on the other side of a wall WP_TraceSetStart( self, start, vec3_origin, vec3_origin );//make sure our start point isn't on the other side of a wall