From fada09a0bbb6c4c0f54c571a7bef57b133370773 Mon Sep 17 00:00:00 2001 From: Petr Bartos Date: Thu, 13 Apr 2023 20:38:13 +0200 Subject: [PATCH] Fix remote turret on-screen help --- Projects/Android/jni/OpenJK/code/game/g_active.cpp | 4 +++- Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp | 4 +++- z_vr_assets_jka/strings/english/vr_ingame.str | 3 +++ z_vr_assets_jka/strings/french/vr_ingame.str | 4 ++++ z_vr_assets_jka/strings/german/vr_ingame.str | 4 ++++ z_vr_assets_jka/strings/spanish/vr_ingame.str | 4 ++++ z_vr_assets_jko/strip/vr_ingame.sp | 7 ++++++- 7 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Projects/Android/jni/OpenJK/code/game/g_active.cpp b/Projects/Android/jni/OpenJK/code/game/g_active.cpp index 8b32ae1..43ca8cb 100644 --- a/Projects/Android/jni/OpenJK/code/game/g_active.cpp +++ b/Projects/Android/jni/OpenJK/code/game/g_active.cpp @@ -281,7 +281,9 @@ void G_SetViewEntity( gentity_t *self, gentity_t *viewEntity ) if ( !self->s.number ) { if (viewEntity->client && viewEntity->client->NPC_class == CLASS_MOUSE) { - CG_CenterPrint( "@VR_INGAME_EXIT_DROID_VIEW", SCREEN_HEIGHT * 0.95 ); + CG_CenterPrint( "@VR_INGAME_EXIT_DROID_VIEW", SCREEN_HEIGHT * 0.95 ); + } else if (Q_stricmp( "misc_panel_turret", viewEntity->classname ) == 0) { + CG_CenterPrint( "@VR_INGAME_EXIT_TURRET_VIEW", SCREEN_HEIGHT * 0.95 ); } else { CG_CenterPrint( "@VR_INGAME_EXIT_CAMERA_VIEW", SCREEN_HEIGHT * 0.95 ); } diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp index 27ed013..d3152cb 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp @@ -238,7 +238,9 @@ void G_SetViewEntity( gentity_t *self, gentity_t *viewEntity ) if ( !self->s.number ) { if (viewEntity->client && viewEntity->client->NPC_class == CLASS_MOUSE) { - CG_CenterPrint( "@VR_INGAME_EXIT_DROID_VIEW", SCREEN_HEIGHT * 0.95 ); + CG_CenterPrint( "@VR_INGAME_EXIT_DROID_VIEW", SCREEN_HEIGHT * 0.95 ); + } else if (Q_stricmp( "misc_panel_turret", viewEntity->classname ) == 0) { + CG_CenterPrint( "@VR_INGAME_EXIT_TURRET_VIEW", SCREEN_HEIGHT * 0.95 ); } else { CG_CenterPrint( "@VR_INGAME_EXIT_CAMERA_VIEW", SCREEN_HEIGHT * 0.95 ); } diff --git a/z_vr_assets_jka/strings/english/vr_ingame.str b/z_vr_assets_jka/strings/english/vr_ingame.str index 2f4ecee..8b5438a 100644 --- a/z_vr_assets_jka/strings/english/vr_ingame.str +++ b/z_vr_assets_jka/strings/english/vr_ingame.str @@ -19,4 +19,7 @@ LANG_ENGLISH "Press 'JUMP' to exit, thumbstick 'UP/DOWN' to switch view." REFERENCE EXIT_DROID_VIEW LANG_ENGLISH "Press 'JUMP' to exit, press 'USE' to activate buttons." +REFERENCE EXIT_TURRET_VIEW +LANG_ENGLISH "Press 'JUMP' to exit, use main controller to aim and shoot." + ENDMARKER diff --git a/z_vr_assets_jka/strings/french/vr_ingame.str b/z_vr_assets_jka/strings/french/vr_ingame.str index e8c1c04..7fedaa3 100644 --- a/z_vr_assets_jka/strings/french/vr_ingame.str +++ b/z_vr_assets_jka/strings/french/vr_ingame.str @@ -21,4 +21,8 @@ REFERENCE EXIT_DROID_VIEW LANG_ENGLISH "Press 'JUMP' to exit, press 'USE' to activate buttons." LANG_FRENCH "#same" +REFERENCE EXIT_TURRET_VIEW +LANG_ENGLISH "Press 'JUMP' to exit, use main controller to aim and shoot." +LANG_FRENCH "#same" + ENDMARKER diff --git a/z_vr_assets_jka/strings/german/vr_ingame.str b/z_vr_assets_jka/strings/german/vr_ingame.str index 70902d8..516b932 100644 --- a/z_vr_assets_jka/strings/german/vr_ingame.str +++ b/z_vr_assets_jka/strings/german/vr_ingame.str @@ -21,4 +21,8 @@ REFERENCE EXIT_DROID_VIEW LANG_ENGLISH "Press 'JUMP' to exit, press 'USE' to activate buttons." LANG_GERMAN "#same" +REFERENCE EXIT_TURRET_VIEW +LANG_ENGLISH "Press 'JUMP' to exit, use main controller to aim and shoot." +LANG_GERMAN "#same" + ENDMARKER diff --git a/z_vr_assets_jka/strings/spanish/vr_ingame.str b/z_vr_assets_jka/strings/spanish/vr_ingame.str index 5d02fe7..dae4854 100644 --- a/z_vr_assets_jka/strings/spanish/vr_ingame.str +++ b/z_vr_assets_jka/strings/spanish/vr_ingame.str @@ -21,4 +21,8 @@ REFERENCE EXIT_DROID_VIEW LANG_ENGLISH "Press 'JUMP' to exit, press 'USE' to activate buttons." LANG_SPANISH "#same" +REFERENCE EXIT_TURRET_VIEW +LANG_ENGLISH "Press 'JUMP' to exit, use main controller to aim and shoot." +LANG_SPANISH "#same" + ENDMARKER diff --git a/z_vr_assets_jko/strip/vr_ingame.sp b/z_vr_assets_jko/strip/vr_ingame.sp index a5a7516..ce1a4c2 100644 --- a/z_vr_assets_jko/strip/vr_ingame.sp +++ b/z_vr_assets_jko/strip/vr_ingame.sp @@ -3,7 +3,7 @@ CONFIG W:\bin\striped.cfg ID 999 REFERENCE VR_INGAME DESCRIPTION "customized in game text for VR port" -COUNT 2 +COUNT 3 INDEX 0 { REFERENCE EXIT_CAMERA_VIEW @@ -14,3 +14,8 @@ INDEX 1 REFERENCE EXIT_DROID_VIEW TEXT_LANGUAGE1 "Press 'JUMP' to exit, press 'USE' to activate buttons." } +INDEX 2 +{ + REFERENCE EXIT_TURRET_VIEW + TEXT_LANGUAGE1 "Press 'JUMP' to exit, use main controller to aim and shoot." +}