From d78ed1f40e9158d6b7dca029a362ec543082def4 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 28 Jan 2023 22:39:48 +0000 Subject: [PATCH] Revert "AT-ST aiming using controller" This reverts commit 3e5a27421e8b9f0662ed0ee1a8c8953316dad631. --- .../jni/OpenJK/codeJK2/game/wp_atst.cpp | 48 ++----------------- 1 file changed, 3 insertions(+), 45 deletions(-) diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp index 40f0778..b47aaa4 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/wp_atst.cpp @@ -27,8 +27,6 @@ along with this program; if not, see . #include "wp_saber.h" #include "w_local.h" #include "g_functions.h" -#include "bg_local.h" -#include // ATST Main //--------------------------------------------------------- @@ -42,27 +40,13 @@ void WP_ATSTMainFire( gentity_t *ent ) // vel = 4500.0f; // } - - vec3_t dir, angs, start; - - if ( BG_UseVRPosition(ent) ) - { - BG_CalculateVRWeaponPosition(start, angs); - AngleVectors( angs, dir, NULL, NULL ); - } - else { - VectorCopy(wpMuzzle, start); - VectorCopy(wpFwd, dir); - vectoangles(wpFwd, angs); - } - if ( !ent->s.number ) { // player shoots faster vel *= 1.6f; } - gentity_t *missile = CreateMissile( start, dir, vel, 10000, ent ); + gentity_t *missile = CreateMissile( wpMuzzle, wpFwd, vel, 10000, ent ); missile->classname = "atst_main_proj"; missile->s.weapon = WP_ATST_MAIN; @@ -92,20 +76,7 @@ void WP_ATSTSideAltFire( gentity_t *ent ) vel = ATST_SIDE_ALT_VELOCITY; } - vec3_t dir, angs, start; - - if ( BG_UseVRPosition(ent) ) - { - BG_CalculateVRWeaponPosition(start, angs); - AngleVectors( angs, dir, NULL, NULL ); - } - else { - VectorCopy(wpMuzzle, start); - VectorCopy(wpFwd, dir); - vectoangles(wpFwd, angs); - } - - gentity_t *missile = CreateMissile( start, dir, vel, 10000, ent, qtrue ); + gentity_t *missile = CreateMissile( wpMuzzle, wpFwd, vel, 10000, ent, qtrue ); missile->classname = "atst_rocket"; missile->s.weapon = WP_ATST_SIDE; @@ -156,20 +127,7 @@ void WP_ATSTSideFire( gentity_t *ent ) { int damage = weaponData[WP_ATST_SIDE].damage; - vec3_t dir, angs, start; - - if ( BG_UseVRPosition(ent) ) - { - BG_CalculateVRWeaponPosition(start, angs); - AngleVectors( angs, dir, NULL, NULL ); - } - else { - VectorCopy(wpMuzzle, start); - VectorCopy(wpFwd, dir); - vectoangles(wpFwd, angs); - } - - gentity_t *missile = CreateMissile( start, dir, ATST_SIDE_MAIN_VELOCITY, 10000, ent, qfalse ); + gentity_t *missile = CreateMissile( wpMuzzle, wpFwd, ATST_SIDE_MAIN_VELOCITY, 10000, ent, qfalse ); missile->classname = "atst_side_proj"; missile->s.weapon = WP_ATST_SIDE;