From 5d88c6fdeef5cd85aae20c7878cc2f39faf4e91d Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sat, 2 Sep 2017 17:39:45 -0500 Subject: [PATCH] Limit ui_smallFont/ui_bigFont/cg_noTaunt cvars to missionpack ui_smallFont and ui_bigFont are for missionpack HUD font size selection. cg_noTaunt disables missionpack taunt voice chats. --- code/cgame/cg_local.h | 2 ++ code/cgame/cg_main.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h index 822c2576..1800bda4 100644 --- a/code/cgame/cg_local.h +++ b/code/cgame/cg_local.h @@ -1167,9 +1167,11 @@ extern vmCvar_t cg_timescaleFadeEnd; extern vmCvar_t cg_timescaleFadeSpeed; extern vmCvar_t cg_timescale; extern vmCvar_t cg_cameraMode; +#ifdef MISSIONPACK extern vmCvar_t cg_smallFont; extern vmCvar_t cg_bigFont; extern vmCvar_t cg_noTaunt; +#endif extern vmCvar_t cg_noProjectileTrail; extern vmCvar_t cg_oldRail; extern vmCvar_t cg_oldRocket; diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c index 780ed3e7..8da095ab 100644 --- a/code/cgame/cg_main.c +++ b/code/cgame/cg_main.c @@ -175,9 +175,11 @@ vmCvar_t cg_cameraOrbitDelay; vmCvar_t cg_timescaleFadeEnd; vmCvar_t cg_timescaleFadeSpeed; vmCvar_t cg_timescale; +#ifdef MISSIONPACK vmCvar_t cg_smallFont; vmCvar_t cg_bigFont; vmCvar_t cg_noTaunt; +#endif vmCvar_t cg_noProjectileTrail; vmCvar_t cg_oldRail; vmCvar_t cg_oldRocket; @@ -309,10 +311,12 @@ static cvarTable_t cvarTable[] = { { &pmove_fixed, "pmove_fixed", "0", CVAR_SYSTEMINFO}, { &pmove_msec, "pmove_msec", "8", CVAR_SYSTEMINFO}, - { &cg_noTaunt, "cg_noTaunt", "0", CVAR_ARCHIVE}, - { &cg_noProjectileTrail, "cg_noProjectileTrail", "0", CVAR_ARCHIVE}, +#ifdef MISSIONPACK { &cg_smallFont, "ui_smallFont", "0.25", CVAR_ARCHIVE}, { &cg_bigFont, "ui_bigFont", "0.4", CVAR_ARCHIVE}, + { &cg_noTaunt, "cg_noTaunt", "0", CVAR_ARCHIVE}, +#endif + { &cg_noProjectileTrail, "cg_noProjectileTrail", "0", CVAR_ARCHIVE}, { &cg_oldRail, "cg_oldRail", "1", CVAR_ARCHIVE}, { &cg_oldRocket, "cg_oldRocket", "1", CVAR_ARCHIVE}, { &cg_oldPlasma, "cg_oldPlasma", "1", CVAR_ARCHIVE},