From 03d171694a3d87c5668513ebf72aeec1396f1e7a Mon Sep 17 00:00:00 2001 From: Grant Bagwell Date: Wed, 30 Dec 2020 21:47:30 +0100 Subject: [PATCH] Fixed Flashlight punching --- .../Android/jni/d3es-multithread-master/neo/game/Weapon.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Projects/Android/jni/d3es-multithread-master/neo/game/Weapon.cpp b/Projects/Android/jni/d3es-multithread-master/neo/game/Weapon.cpp index c2e7040..6203acf 100644 --- a/Projects/Android/jni/d3es-multithread-master/neo/game/Weapon.cpp +++ b/Projects/Android/jni/d3es-multithread-master/neo/game/Weapon.cpp @@ -2582,8 +2582,7 @@ void idWeapon::PresentWeapon( bool showViewModel, int hand ) { weapon_t currentWeapon = WEAPON_NONE; currentWeapon = IdentifyWeapon(); - //if ( isPlayerFlashlight || hand != vr_weaponHand.GetInteger()) - if (isPlayerFlashlight) + if ( isPlayerFlashlight || (hand != vr_weaponHand.GetInteger() && owner->hands[hand].idealWeapon != owner->weapon_pda)) { viewWeaponOrigin = playerViewOrigin; viewWeaponAxis = playerViewAxis;