adjustments

Author: Vauff

cfg/cs2fixes/cs2fixes.cfg

@@ -13,7 +13,7 @@ cs2f_hide_enable 				0		// Whether to enable hide (WARNING: randomly crashes cli
 cs2f_votemanager_enable			0		// Whether to enable votemanager features such as map vote fix, nominations, RTV and extends
 cs2f_trigger_timer_enable		0		// Whether to process countdown messages said by Console (e.g. Hold for 10 seconds) and append the round time where the countdown resolves
 cs2f_block_nav_lookup			0		// Whether to block navigation mesh lookup, improves server performance but breaks bot navigation
-cs2f_flashlight_enable			0		// Whether to enable flashlights
+cs2f_flashlight_enable			0		// Whether to enable flashlights (0=disabled, 1=light_barn flashlight, limited vertical movement, 2=particle flashlight, no cvar customization)
 cs2f_infinite_reserve_ammo		0		// Whether to enable infinite reserve ammo on weapons
 cs2f_disable_subtick_move		0		// Whether to disable subtick movement
 cs2f_disable_subtick_shooting	0		// Whether to disable subtick shooting, experimental (WARNING: add "log_flags Shooting +DoNotEcho" to your cfg to prevent console spam on every shot fired)
@@ -40,8 +40,8 @@ cs2f_flashlight_brightness		1.0		// How bright should flashlights be
 cs2f_flashlight_distance		54		// How far flashlights should be from the player's head (the default is such that an equipped awp doesn't block the light if shadows are enabled)
 cs2f_flashlight_angle			45.0	// How wide should the flashlight be in degrees
 cs2f_flashlight_color			"255 255 255 0"	// What color to use for flashlights
-cs2f_flashlight_attachment		axis_of_intent	// Which attachment to parent a flashlight to. If the player model is not properly setup, you might have to use clip_limit here instead
-cs2f_flashlight_particle		"particles/cs2fixes/simple_flashlight.vpcf" //If set, ignore all other flashlight settings and spawn this particle as flashlight
+cs2f_flashlight_attachment		"clip_limit"	// Which attachment to parent a flashlight to
+cs2f_flashlight_particle		"particles/cs2fixes/simple_flashlight.vpcf" // Path to flashlight particle
 
 // Damage block settings
 cs2f_block_molotov_self_dmg 	0		// Whether to block self-damage from molotovs

src/playermanager.cpp

@@ -46,7 +46,7 @@ CConVar<int> g_cvarAdminImmunityTargetting("cs2f_admin_immunity", FCVAR_NONE, "M
 CConVar<bool> g_cvarEnableMapSteamIds("cs2f_map_steamids_enable", FCVAR_NONE, "Whether to make Steam ID's available to maps", false);
 
 ZEPlayerHandle::ZEPlayerHandle() :
-	m_Index(INVALID_ZEPLAYERHANDLE_INDEX) {};
+	m_Index(INVALID_ZEPLAYERHANDLE_INDEX){};
 
 ZEPlayerHandle::ZEPlayerHandle(CPlayerSlot slot)
 {
@@ -163,14 +163,15 @@ void ZEPlayer::SetHideDistance(int distance)
 	g_pUserPreferencesSystem->SetPreferenceInt(m_slot.Get(), HIDE_DISTANCE_PREF_KEY_NAME, distance);
 }
 
+CConVar<int> g_cvarFlashLightEnable("cs2f_flashlight_enable", FCVAR_NONE, "Whether to enable flashlights (0=disabled, 1=light_barn flashlight, limited vertical movement, 2=particle flashlight, no cvar customization)", false);
 CConVar<bool> g_cvarFlashLightShadows("cs2f_flashlight_shadows", FCVAR_NONE, "Whether to enable flashlight shadows", true);
 CConVar<bool> g_cvarFlashLightTransmitOthers("cs2f_flashlight_transmit_others", FCVAR_NONE, "Whether to transmit other player's flashlights, recommended to have shadows off for this", false);
 CConVar<float> g_cvarFlashLightBrightness("cs2f_flashlight_brightness", FCVAR_NONE, "How bright should flashlights be", 1.0f);
 CConVar<float> g_cvarFlashLightDistance("cs2f_flashlight_distance", FCVAR_NONE, "How far flashlights should be from the player's head", 54.0f); // The minimum distance such that an awp wouldn't block the light
 CConVar<float> g_cvarFlashLightAngle("cs2f_flashlight_angle", FCVAR_NONE, "How wide should the flashlight be in degrees", 45.0f);
 CConVar<Color> g_cvarFlashLightColor("cs2f_flashlight_color", FCVAR_NONE, "What color to use for flashlights", Color(255, 255, 255));
-CConVar<CUtlString> g_cvarFlashLightAttachment("cs2f_flashlight_attachment", FCVAR_NONE, "Which attachment to parent a flashlight to. If the player model is not properly setup, you might have to use clip_limit here instead", "axis_of_intent");
-CConVar<CUtlString> g_cvarFlashLightParticle("cs2f_flashlight_particle", FCVAR_NONE, "If set, ignore all other flashlight settings and spawn this particle as flashlight", "");
+CConVar<CUtlString> g_cvarFlashLightAttachment("cs2f_flashlight_attachment", FCVAR_NONE, "Which attachment to parent a flashlight to. If the player model is not properly setup, you might have to use clip_limit here instead", "clip_limit");
+CConVar<CUtlString> g_cvarFlashLightParticle("cs2f_flashlight_particle", FCVAR_NONE, "If set, ignore all other flashlight settings and spawn this particle as flashlight", "particles/cs2fixes/simple_flashlight.vpcf");
 
 void TeleportFlashLight(CCSPlayerPawn* pPawn, CBaseEntity* pLight, float flDistance = -1.f, QAngle angOverride = vec3_angle)
 {
@@ -241,7 +242,7 @@ void ZEPlayer::ToggleFlashLight()
 	pController->EmitSoundFilter(filter, "HudChat.Message");
 
 	// particle flashlight
-	if (g_cvarFlashLightParticle.Get().Length())
+	if (g_cvarFlashLightEnable.Get() == 2)
 	{
 		pController->DispatchParticle(g_cvarFlashLightParticle.Get().String(), &filter);
 		return;
@@ -951,8 +952,6 @@ void CPlayerManager::CheckInfractions()
 	g_pAdminSystem->SaveInfractions();
 }
 
-CConVar<bool> g_cvarFlashLightEnable("cs2f_flashlight_enable", FCVAR_NONE, "Whether to enable flashlights", false);
-
 void CPlayerManager::FlashLightThink()
 {
 	if (!g_cvarFlashLightEnable.Get() || !GetGlobals())