teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2025-02-17 17:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Get the ATST working correctly in JKA

Browse source
This commit is contained in:
Simon 2023-05-27 12:17:20 +01:00
parent 2a3efff83e
commit b074d1cbf6
3 changed files with 52 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Projects/Android/jni/OpenJK/code/cgame/cg_draw.cpp
View file

@ -2984,7 +2984,13 @@ static void CG_DrawCrosshair3D(int type) // 0 - force, 1 - weapons
return; return;
} }
if ( in_camera || vr->in_vehicle) { if ( in_camera) {
return;
}
if (vr->in_vehicle &&
(type == 0 || vr->vehicle_type != VH_WALKER))
{
return; return;
} }

48
Projects/Android/jni/OpenJK/code/game/wp_atst.cpp
View file

@ -24,6 +24,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "b_local.h" #include "b_local.h"
#include "wp_saber.h" #include "wp_saber.h"
#include "w_local.h" #include "w_local.h"
#include "bg_local.h"
// ATST Main // ATST Main
//--------------------------------------------------------- //---------------------------------------------------------
@ -37,6 +38,19 @@ void WP_ATSTMainFire( gentity_t *ent )
// vel = 4500.0f; // vel = 4500.0f;
// } // }
vec3_t dir, angs, start;
if ( BG_UseVRPosition(ent) )
{
BG_CalculateVRWeaponPosition(start, angs);
AngleVectors( angs, dir, NULL, NULL );
}
else {
VectorCopy(muzzle, start);
VectorCopy(forwardVec, dir);
vectoangles(forwardVec, angs);
}
if ( !ent->s.number ) if ( !ent->s.number )
{ {
// player shoots faster // player shoots faster
@ -45,7 +59,7 @@ void WP_ATSTMainFire( gentity_t *ent )
WP_MissileTargetHint(ent, muzzle, forwardVec); WP_MissileTargetHint(ent, muzzle, forwardVec);
gentity_t *missile = CreateMissile( muzzle, forwardVec, vel, 10000, ent ); gentity_t *missile = CreateMissile( start, dir, vel, 10000, ent );
missile->classname = "atst_main_proj"; missile->classname = "atst_main_proj";
missile->s.weapon = WP_ATST_MAIN; missile->s.weapon = WP_ATST_MAIN;
@ -75,7 +89,20 @@ void WP_ATSTSideAltFire( gentity_t *ent )
vel = ATST_SIDE_ALT_VELOCITY; vel = ATST_SIDE_ALT_VELOCITY;
} }
gentity_t *missile = CreateMissile( muzzle, forwardVec, vel, 10000, ent, qtrue ); vec3_t dir, angs, start;
if ( BG_UseVRPosition(ent) )
{
BG_CalculateVRWeaponPosition(start, angs);
AngleVectors( angs, dir, NULL, NULL );
}
else {
VectorCopy(muzzle, start);
VectorCopy(forwardVec, dir);
vectoangles(forwardVec, angs);
}
gentity_t *missile = CreateMissile( start, dir, vel, 10000, ent, qtrue );
missile->classname = "atst_rocket"; missile->classname = "atst_rocket";
missile->s.weapon = WP_ATST_SIDE; missile->s.weapon = WP_ATST_SIDE;
@ -99,7 +126,7 @@ void WP_ATSTSideAltFire( gentity_t *ent )
} }
} }
VectorCopy( forwardVec, missile->movedir ); VectorCopy( dir, missile->movedir );
// Make it easier to hit things // Make it easier to hit things
VectorSet( missile->maxs, ATST_SIDE_ALT_ROCKET_SIZE, ATST_SIDE_ALT_ROCKET_SIZE, ATST_SIDE_ALT_ROCKET_SIZE ); VectorSet( missile->maxs, ATST_SIDE_ALT_ROCKET_SIZE, ATST_SIDE_ALT_ROCKET_SIZE, ATST_SIDE_ALT_ROCKET_SIZE );
@ -126,7 +153,20 @@ void WP_ATSTSideFire( gentity_t *ent )
{ {
int damage = weaponData[WP_ATST_SIDE].damage; int damage = weaponData[WP_ATST_SIDE].damage;
gentity_t *missile = CreateMissile( muzzle, forwardVec, ATST_SIDE_MAIN_VELOCITY, 10000, ent, qfalse ); vec3_t dir, angs, start;
if ( BG_UseVRPosition(ent) )
{
BG_CalculateVRWeaponPosition(start, angs);
AngleVectors( angs, dir, NULL, NULL );
}
else {
VectorCopy(muzzle, start);
VectorCopy(forwardVec, dir);
vectoangles(forwardVec, angs);
}
gentity_t *missile = CreateMissile( start, dir, ATST_SIDE_MAIN_VELOCITY, 10000, ent, qfalse );
missile->classname = "atst_side_proj"; missile->classname = "atst_side_proj";
missile->s.weapon = WP_ATST_SIDE; missile->s.weapon = WP_ATST_SIDE;

3
Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp
View file

@ -28,7 +28,6 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "w_local.h" #include "w_local.h"
#include "g_functions.h" #include "g_functions.h"
#include "bg_local.h" #include "bg_local.h"
#include <JKXR/VrClientInfo.h>
// ATST Main // ATST Main
//--------------------------------------------------------- //---------------------------------------------------------
@ -129,7 +128,7 @@ void WP_ATSTSideAltFire( gentity_t *ent )
} }
} }
VectorCopy( wpFwd, missile->movedir ); VectorCopy( dir, missile->movedir );
// Make it easier to hit things // Make it easier to hit things
VectorSet( missile->maxs, ATST_SIDE_ALT_ROCKET_SIZE, ATST_SIDE_ALT_ROCKET_SIZE, ATST_SIDE_ALT_ROCKET_SIZE ); VectorSet( missile->maxs, ATST_SIDE_ALT_ROCKET_SIZE, ATST_SIDE_ALT_ROCKET_SIZE, ATST_SIDE_ALT_ROCKET_SIZE );