From f379e46b8632092df3438d8fb7f5c7ded631d692 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 30 Mar 2023 22:16:37 +0100 Subject: [PATCH] Camera shake fix part 2 --- Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp | 8 +------- Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp index f21b8c1..1147f7e 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_players.cpp @@ -6156,7 +6156,7 @@ Ghoul2 Insert End scale = 1.75f; } - /* + if ( val < 0.0f ) { val = 0.0f; @@ -6164,13 +6164,7 @@ Ghoul2 Insert End else if ( val > 1.0f ) { val = 1.0f; - CGCam_Shake( 0.1f, 100 ); } - else - { - CGCam_Shake( val * val * 0.3f, 100 ); - } - */ val += Q_flrand(0.0f, 1.0f) * 0.5f; diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp index aa44ee2..14fa99b 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp @@ -1343,7 +1343,7 @@ void CG_AddViewWeapon( playerState_t *ps ) scale = 1.75f; } - /* + if ( val < 0.0f ) { val = 0.0f; @@ -1351,13 +1351,7 @@ void CG_AddViewWeapon( playerState_t *ps ) else if ( val > 1.0f ) { val = 1.0f; - CGCam_Shake( 0.1f, 100 ); } - else - { - CGCam_Shake( val * val * 0.3f, 100 ); - } - */ val += Q_flrand(0.0f, 1.0f) * 0.5f;