teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-03-15 06:30:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix default value of gore level; Add proper gore settings to team arena

Browse source
This commit is contained in:
Petr Bartos 2022-03-29 23:26:46 +02:00
parent 24ce45a3c5
commit 4b0bfe599d
6 changed files with 47 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/app/src/main/assets/pakQ3Q.pk3
View file

Binary file not shown.

9
android/app/src/main/cpp/code/q3_ui/ui_preferences.c
View file

@ -126,14 +126,7 @@ static void Preferences_SetMenuItems( void ) {
s_preferences.drawhud.curvalue = trap_Cvar_VariableValue( "cg_drawStatus" ) != 0;
// s_preferences.allowdownload.curvalue = trap_Cvar_VariableValue( "cl_allowDownload" ) != 0;
s_preferences.holster2d.curvalue = trap_Cvar_VariableValue( "cg_weaponSelectorSimple2DIcons" ) != 0;
//GORE
{
int level = trap_Cvar_VariableValue( "com_blood" ) +
trap_Cvar_VariableValue( "cg_gibs" ) +
trap_Cvar_VariableValue( "cg_megagibs" );
s_preferences.gore.curvalue = level % NUM_GORE;
}
s_preferences.gore.curvalue = trap_Cvar_VariableValue( "vr_goreLevel" );
s_preferences.showinhand.curvalue = trap_Cvar_VariableValue( "vr_showItemInHand" ) != 0;
s_preferences.selectorwithhud.curvalue = trap_Cvar_VariableValue( "vr_weaponSelectorWithHud" ) != 0;
}

23
android/app/src/main/cpp/code/ui/ui_main.c
View file

@ -3230,6 +3230,29 @@ static void UI_Update(const char *name) {
trap_Cvar_Set("vr_button_map_RTHUMBBACK_ALT", "");
}
}
} else if (Q_stricmp(name, "vr_goreLevel") == 0) {
switch (val) {
case 0:
trap_Cvar_SetValue( "com_blood", 0);
trap_Cvar_SetValue( "cg_gibs", 0);
trap_Cvar_SetValue( "cg_megagibs", 0);
break;
case 1:
trap_Cvar_SetValue( "com_blood", 1);
trap_Cvar_SetValue( "cg_gibs", 0);
trap_Cvar_SetValue( "cg_megagibs", 0);
break;
case 2:
trap_Cvar_SetValue( "com_blood", 1);
trap_Cvar_SetValue( "cg_gibs", 1);
trap_Cvar_SetValue( "cg_megagibs", 0);
break;
case 3:
trap_Cvar_SetValue( "com_blood", 1);
trap_Cvar_SetValue( "cg_gibs", 1);
trap_Cvar_SetValue( "cg_megagibs", 1);
break;
}
}
}

2
android/app/src/main/cpp/code/vr/vr_base.c
View file

@ -39,6 +39,7 @@ cvar_t *vr_hapticIntensity = NULL;
cvar_t *vr_comfortVignette = NULL;
cvar_t *vr_weaponSelectorMode = NULL;
cvar_t *vr_weaponSelectorWithHud = NULL;
cvar_t *vr_goreLevel = NULL;
engine_t* VR_Init( ovrJava java )
{
@ -80,6 +81,7 @@ void VR_InitCvars( void )
vr_comfortVignette = Cvar_Get ("vr_comfortVignette", "0.0", CVAR_ARCHIVE);
vr_weaponSelectorMode = Cvar_Get ("vr_weaponSelectorMode", "0", CVAR_ARCHIVE);
vr_weaponSelectorWithHud = Cvar_Get ("vr_weaponSelectorWithHud", "0", CVAR_ARCHIVE);
vr_goreLevel = Cvar_Get ("vr_goreLevel", "2", CVAR_ARCHIVE);
// Values are: scale,right,up,forward,pitch,yaw,roll
// VALUES PROVIDED BY SkillFur - Thank-you!

53
android/app/src/main/pakQ3Q/ui/ingame_options.menu
View file

@ -409,54 +409,23 @@ itemDef {
visible 1
}
itemDef {
name options
itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Blood:"
cvar "com_blood"
rect 50 309 200 20
text "Gore:"
type ITEM_TYPE_MULTI
cvar "vr_goreLevel"
cvarFloatList { "None" 0 "Blood Only" 1 "Blood & Gibs (Default)" 2 "Extra Gore (Performance Hit)" 3 }
rect 50 329 200 20
textalign ITEM_ALIGN_RIGHT
textalignx 143
textalignx 80
textaligny 17
textscale .25
textscale .25
forecolor 1 1 1 1
visible 1
visible 1
action { uiScript update "vr_goreLevel" }
}
itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Gibs:"
cvar "cg_gibs"
rect 50 326 200 20
textalign ITEM_ALIGN_RIGHT
textalignx 143
textaligny 17
textscale .25
forecolor 1 1 1 1
visible 1
action { exec "loadhud" }
}
itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Extra Gibs (Performance Hit):"
cvar "cg_megagibs"
rect 50 343 200 20
textalign ITEM_ALIGN_RIGHT
textalignx 143
textaligny 17
textscale .25
forecolor 1 1 1 1
visible 1
}
}

49
android/app/src/main/pakQ3Q/ui/options.menu
View file

@ -290,52 +290,23 @@ itemDef {
visible 1
}
itemDef {
itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Blood:"
cvar "com_blood"
rect 99 365 256 20
text "Gore:"
type ITEM_TYPE_MULTI
cvar "vr_goreLevel"
cvarFloatList { "None" 0 "Blood Only" 1 "Blood & Gibs (Default)" 2 "Extra Gore (Performance Hit)" 3 }
rect 99 375 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128
textalignx 70
textaligny 20
textscale .3
textscale .3
forecolor 1 1 1 1
visible 1
visible 1
action { uiScript update "vr_goreLevel" }
}
itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Gibs:"
cvar "cg_gibs"
rect 99 385 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128
textaligny 20
textscale .3
forecolor 1 1 1 1
visible 1
}
itemDef {
name options
group grpOptions
type ITEM_TYPE_YESNO
text "Extra Gibs (Performance Hit):"
cvar "cg_megagibs"
rect 99 405 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128
textaligny 20
textscale .3
forecolor 1 1 1 1
visible 1
}
itemDef {
name fadebox
style WINDOW_STYLE_FILLED