teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-21 19:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix remote turret on-screen help

Browse source
This commit is contained in:
Petr Bartos 2023-04-13 20:38:13 +02:00
parent 82af313786
commit fada09a0bb
7 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Projects/Android/jni/OpenJK/code/game/g_active.cpp
View file

@ -281,7 +281,9 @@ void G_SetViewEntity( gentity_t *self, gentity_t *viewEntity )
if ( !self->s.number ) if ( !self->s.number )
{ {
if (viewEntity->client && viewEntity->client->NPC_class == CLASS_MOUSE) { 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 { } else {
CG_CenterPrint( "@VR_INGAME_EXIT_CAMERA_VIEW", SCREEN_HEIGHT * 0.95 ); CG_CenterPrint( "@VR_INGAME_EXIT_CAMERA_VIEW", SCREEN_HEIGHT * 0.95 );
} }

4
Projects/Android/jni/OpenJK/codeJK2/game/g_active.cpp
View file

@ -238,7 +238,9 @@ void G_SetViewEntity( gentity_t *self, gentity_t *viewEntity )
if ( !self->s.number ) if ( !self->s.number )
{ {
if (viewEntity->client && viewEntity->client->NPC_class == CLASS_MOUSE) { 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 { } else {
CG_CenterPrint( "@VR_INGAME_EXIT_CAMERA_VIEW", SCREEN_HEIGHT * 0.95 ); CG_CenterPrint( "@VR_INGAME_EXIT_CAMERA_VIEW", SCREEN_HEIGHT * 0.95 );
} }

3
z_vr_assets_jka/strings/english/vr_ingame.str
View file

@ -19,4 +19,7 @@ LANG_ENGLISH "Press 'JUMP' to exit, thumbstick 'UP/DOWN' to switch view."
REFERENCE EXIT_DROID_VIEW REFERENCE EXIT_DROID_VIEW
LANG_ENGLISH "Press 'JUMP' to exit, press 'USE' to activate buttons." 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 ENDMARKER

4
z_vr_assets_jka/strings/french/vr_ingame.str
View file

@ -21,4 +21,8 @@ REFERENCE EXIT_DROID_VIEW
LANG_ENGLISH "Press 'JUMP' to exit, press 'USE' to activate buttons." LANG_ENGLISH "Press 'JUMP' to exit, press 'USE' to activate buttons."
LANG_FRENCH "#same" LANG_FRENCH "#same"
REFERENCE EXIT_TURRET_VIEW
LANG_ENGLISH "Press 'JUMP' to exit, use main controller to aim and shoot."
LANG_FRENCH "#same"
ENDMARKER ENDMARKER

4
z_vr_assets_jka/strings/german/vr_ingame.str
View file

@ -21,4 +21,8 @@ REFERENCE EXIT_DROID_VIEW
LANG_ENGLISH "Press 'JUMP' to exit, press 'USE' to activate buttons." LANG_ENGLISH "Press 'JUMP' to exit, press 'USE' to activate buttons."
LANG_GERMAN "#same" LANG_GERMAN "#same"
REFERENCE EXIT_TURRET_VIEW
LANG_ENGLISH "Press 'JUMP' to exit, use main controller to aim and shoot."
LANG_GERMAN "#same"
ENDMARKER ENDMARKER

4
z_vr_assets_jka/strings/spanish/vr_ingame.str
View file

@ -21,4 +21,8 @@ REFERENCE EXIT_DROID_VIEW
LANG_ENGLISH "Press 'JUMP' to exit, press 'USE' to activate buttons." LANG_ENGLISH "Press 'JUMP' to exit, press 'USE' to activate buttons."
LANG_SPANISH "#same" LANG_SPANISH "#same"
REFERENCE EXIT_TURRET_VIEW
LANG_ENGLISH "Press 'JUMP' to exit, use main controller to aim and shoot."
LANG_SPANISH "#same"
ENDMARKER ENDMARKER

7
z_vr_assets_jko/strip/vr_ingame.sp
View file

@ -3,7 +3,7 @@ CONFIG W:\bin\striped.cfg
ID 999 ID 999
REFERENCE VR_INGAME REFERENCE VR_INGAME
DESCRIPTION "customized in game text for VR port" DESCRIPTION "customized in game text for VR port"
COUNT 2 COUNT 3
INDEX 0 INDEX 0
{ {
REFERENCE EXIT_CAMERA_VIEW REFERENCE EXIT_CAMERA_VIEW
@ -14,3 +14,8 @@ INDEX 1
REFERENCE EXIT_DROID_VIEW REFERENCE EXIT_DROID_VIEW
TEXT_LANGUAGE1 "Press 'JUMP' to exit, press 'USE' to activate buttons." 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."
}