* Removed ce_fovoverride_enabled, ce_fovoverride_fov, and ce_fovoverride_zoomed.

* Added ce_fovoverride_firstperson, ce_fovoverride_thirdperson, ce_fovoverride_roaming, ce_fovoverride_fixed, ce_fovoverride_test, and ce_fovoverride_test_enabled.

Author: PazerOP

CastingEssentials/Hooking/IGroupHook.h

@@ -26,7 +26,12 @@ namespace Hooking
 	{
 		// Detours a global function.
 		Global,
+
+		// Detours a member function of a class. Applies to all instances, but passes the class
+		// pointer through to the detour function.
 		GlobalClass,
+
+		// Detours a member function of a class. Applies to all instances.
 		Class,
 
 		// Detours a specific instance of a class (replaces a function pointer in a duplicated vtable).

CastingEssentials/Misc/HLTVCameraHack.h

@@ -1,10 +1,13 @@
 #pragma once
 #include <client/hltvcamera.h>
 
+enum ObserverMode;
+
 class HLTVCameraOverride : public C_HLTVCamera
 {
 public:
-	using C_HLTVCamera::m_nCameraMode;
+	ObserverMode GetMode() const { return (ObserverMode)m_nCameraMode; }
+	//using C_HLTVCamera::m_nCameraMode;
 	using C_HLTVCamera::m_iCameraMan;
 	using C_HLTVCamera::m_vCamOrigin;
 	using C_HLTVCamera::m_aCamAngle;

CastingEssentials/Misc/OffsetChecking.cpp

@@ -1,4 +1,5 @@
 #include <client/c_baseanimating.h>
+#include <client/c_baseplayer.h>
 #include <vgui_controls/ImagePanel.h>
 #include <vgui_controls/ProgressBar.h>
 
@@ -14,6 +15,10 @@ class OffsetChecking
 	OFFSET_CHECK(C_BaseAnimating, m_bDynamicModelPending, 2185);
 	OFFSET_CHECK(C_BaseAnimating, m_pStudioHdr, 2192);
 
+	OFFSET_CHECK(C_BasePlayer, m_iFOVStart, 4152);
+	OFFSET_CHECK(C_BasePlayer, m_iDefaultFOV, 4160);
+	OFFSET_CHECK(C_BasePlayer, m_hVehicle, 4300);
+
 	OFFSET_CHECK(vgui::ContinuousProgressBar, _unknown0, 388);
 	OFFSET_CHECK(vgui::ContinuousProgressBar, _unknown1, 392);
 	OFFSET_CHECK(vgui::ContinuousProgressBar, _unknown2, 396);

CastingEssentials/Modules/CameraSmooths.cpp

@@ -280,11 +280,11 @@ bool CameraSmooths::SetupEngineViewOverride(Vector &origin, QAngle &angles, floa
 	const float frametime = Interfaces::GetEngineTool()->HostFrameTime();
 	const float hosttime = Interfaces::GetEngineTool()->HostTime();
 
-	if (hltvcamera->m_nCameraMode == OBS_MODE_IN_EYE || hltvcamera->m_nCameraMode == OBS_MODE_CHASE)
+	if (hltvcamera->GetMode() == OBS_MODE_IN_EYE || hltvcamera->GetMode() == OBS_MODE_CHASE)
 	{
-		if (hltvcamera->m_iTraget1 != m_EndTarget || (hltvcamera->m_nCameraMode != m_EndMode && !m_InProgress))
+		if (hltvcamera->m_iTraget1 != m_EndTarget || (hltvcamera->GetMode() != m_EndMode && !m_InProgress))
 		{
-			m_EndMode = hltvcamera->m_nCameraMode;
+			m_EndMode = hltvcamera->GetMode();
 			m_EndTarget = hltvcamera->m_iTraget1;
 
 			Vector currentForward;
@@ -416,7 +416,7 @@ bool CameraSmooths::SetupEngineViewOverride(Vector &origin, QAngle &angles, floa
 		}
 	}
 
-	m_EndMode = hltvcamera->m_nCameraMode;
+	m_EndMode = hltvcamera->GetMode();
 	m_EndTarget = hltvcamera->m_iTraget1;
 	m_InProgress = false;
 	m_LastHostTime = hosttime;

CastingEssentials/Modules/CameraState.cpp

@@ -25,13 +25,13 @@ CameraState::CameraState()
 
 ObserverMode CameraState::GetObserverMode()
 {
-	if (auto engineClient = Interfaces::GetEngineClient(); engineClient->IsHLTV())
+	if (auto engineClient = Interfaces::GetEngineClient(); engineClient && engineClient->IsHLTV())
 	{
-		if (auto hltvCamera = Interfaces::GetHLTVCamera(); hltvCamera)
-			return (ObserverMode)hltvCamera->m_nCameraMode;
+		if (auto hltvCamera = Interfaces::GetHLTVCamera())
+			return hltvCamera->GetMode();
 	}
 
-	if (const auto localPlayer = Player::GetLocalPlayer(); localPlayer)
+	if (const auto localPlayer = Player::GetLocalPlayer())
 		return localPlayer->GetObserverMode();
 
 	Assert(!"Unable to determine current observer mode");

CastingEssentials/Modules/CameraTools.cpp

@@ -2,6 +2,7 @@
 #include "Misc/HLTVCameraHack.h"
 #include "Modules/CameraSmooths.h"
 #include "Modules/CameraState.h"
+#include "Modules/FOVOverride.h"
 #include "PluginBase/HookManager.h"
 #include "PluginBase/Interfaces.h"
 #include "PluginBase/Player.h"
@@ -67,6 +68,7 @@ CameraTools::CameraTools() :
 {
 	m_SetModeHook = 0;
 	m_SetPrimaryTargetHook = 0;
+	m_SwitchReason = ModeSwitchReason::Unknown;
 	m_SpecGUISettings = new KeyValues("Resource/UI/SpectatorTournament.res");
 	m_SpecGUISettings->LoadFromFile(g_pFullFileSystem, "resource/ui/spectatortournament.res", "mod");
 
@@ -164,32 +166,34 @@ bool CameraTools::CheckDependencies()
 	return ready;
 }
 
-void CameraTools::SpecPosition(const Vector& pos, const QAngle& angle, ObserverMode mode)
+void CameraTools::SpecPosition(const Vector& pos, const QAngle& angle, ObserverMode mode, float fov)
 {
 	if (Interfaces::GetEngineClient()->IsHLTV())
 	{
 		try
 		{
 			HLTVCameraOverride* const hltvcamera = Interfaces::GetHLTVCamera();
 
-			hltvcamera->m_nCameraMode = mode;
+			GetHooks()->GetFunc<C_HLTVCamera_SetMode>()(mode);
+			m_SwitchReason = ModeSwitchReason::SpecPosition;
+
 			hltvcamera->m_iCameraMan = 0;
 			hltvcamera->m_vCamOrigin = pos;
 			hltvcamera->m_aCamAngle = angle;
 			hltvcamera->m_iTraget1 = 0;
 			hltvcamera->m_iTraget2 = 0;
 			hltvcamera->m_flLastAngleUpdateTime = -1;
 
+			if (fov > 0)
+				hltvcamera->m_flFOV = fov;
+
 			// We may have to set angles directly
 			if (mode == OBS_MODE_ROAMING)
 			{
 				QAngle wtf(angle);	// Why does this take a non-const reference
 				Interfaces::GetEngineClient()->SetViewAngles(wtf);
 			}
 
-			static ConVarRef fov_desired("fov_desired");
-			hltvcamera->m_flFOV = fov_desired.GetFloat();
-
 			GetHooks()->GetFunc<C_HLTVCamera_SetCameraAngle>()(hltvcamera->m_aCamAngle);
 		}
 		catch (bad_pointer &e)
@@ -455,7 +459,7 @@ void CameraTools::SpecPlayer(int playerIndex)
 
 				HLTVCameraOverride* const hltvcamera = Interfaces::GetHLTVCamera();
 				if (hltvcamera)
-					hltvcamera->m_nCameraMode = ce_tplock_enable.GetBool() ? OBS_MODE_CHASE : OBS_MODE_IN_EYE;
+					GetHooks()->GetFunc<C_HLTVCamera_SetMode>()(ce_tplock_enable.GetBool() ? OBS_MODE_CHASE : OBS_MODE_IN_EYE);
 			}
 			catch (bad_pointer &e)
 			{
@@ -474,6 +478,9 @@ void CameraTools::SpecPlayer(int playerIndex)
 void CameraTools::OnTick(bool inGame)
 {
 	VPROF_BUDGET(__FUNCTION__, VPROF_BUDGETGROUP_CE);
+
+	AttachHooks(inGame);
+
 	if (inGame)
 	{
 		if (ce_cameratools_show_mode.GetBool())
@@ -483,7 +490,7 @@ void CameraTools::OnTick(bool inGame)
 			std::string playerName;
 			if (Interfaces::GetEngineClient()->IsHLTV())
 			{
-				mode = Interfaces::GetHLTVCamera()->m_nCameraMode;
+				mode = Interfaces::GetHLTVCamera()->GetMode();
 				target = Interfaces::GetHLTVCamera()->m_iTraget1;
 				if (Player::IsValidIndex(target) && Player::GetPlayer(target, __FUNCSIG__))
 					playerName = Player::GetPlayer(target, __FUNCSIG__)->GetName();
@@ -508,6 +515,22 @@ void CameraTools::OnTick(bool inGame)
 	}
 }
 
+void CameraTools::AttachHooks(bool attach)
+{
+	if (attach)
+	{
+		if (!m_SetModeHook)
+			m_SetModeHook = GetHooks()->AddHook<C_HLTVCamera_SetMode>(std::bind(&CameraTools::SetModeOverride, this, std::placeholders::_1));
+	}
+	else
+	{
+		if (m_SetModeHook && GetHooks()->RemoveHook<C_HLTVCamera_SetMode>(m_SetModeHook, __FUNCSIG__))
+			m_SetModeHook = 0;
+
+		Assert(!m_SetModeHook);
+	}
+}
+
 Vector CameraTools::CalcPosForAngle(const Vector& orbitCenter, const QAngle& angle)
 {
 	Vector forward, right, up;
@@ -592,7 +615,7 @@ bool CameraTools::SetupEngineViewOverride(Vector& origin, QAngle& angles, float&
 	m_LastFrameAngle = idealAngles;
 	m_LastTargetPlayer = targetPlayer;
 
-	if (hltvcamera->m_nCameraMode != OBS_MODE_CHASE)
+	if (hltvcamera->GetMode() != OBS_MODE_CHASE)
 		return false;
 
 	if (!ce_tplock_enable.GetBool())
@@ -723,10 +746,6 @@ void CameraTools::ChangeForceMode(IConVar *var, const char *pOldValue, float flO
 
 	if (forceMode == OBS_MODE_FIXED || forceMode == OBS_MODE_IN_EYE || forceMode == OBS_MODE_CHASE || forceMode == OBS_MODE_ROAMING)
 	{
-		if (!m_SetModeHook)
-			m_SetModeHook = GetHooks()->AddHook<C_HLTVCamera_SetMode>(
-				std::bind(&CameraTools::SetModeOverride, this, std::placeholders::_1));
-
 		try
 		{
 			GetHooks()->GetHook<C_HLTVCamera_SetMode>()->GetOriginal()(forceMode);
@@ -738,13 +757,8 @@ void CameraTools::ChangeForceMode(IConVar *var, const char *pOldValue, float flO
 	}
 	else
 	{
+		PluginWarning("%s: Unsupported spec_mode \"%s\"", var->GetName(), ce_cameratools_autodirector_mode.GetString());
 		var->SetValue(OBS_MODE_NONE);
-
-		if (m_SetModeHook)
-		{
-			GetHooks()->RemoveHook<C_HLTVCamera_SetMode>(m_SetModeHook, __FUNCSIG__);
-			m_SetModeHook = 0;
-		}
 	}
 }
 
@@ -762,6 +776,8 @@ void CameraTools::SetModeOverride(int iMode)
 		GetHooks()->GetOriginal<C_HLTVCamera_SetMode>()(iMode);
 		GetHooks()->GetHook<C_HLTVCamera_SetMode>()->SetState(Hooking::HookAction::SUPERCEDE);
 	}
+
+	m_SwitchReason = ModeSwitchReason::Unknown;
 }
 
 void CameraTools::SetPrimaryTargetOverride(int nEntity)
@@ -875,7 +891,7 @@ void CameraTools::SpecPosition(const CCommand &command)
 	QAngle pluginAng;
 	CameraState::GetModule()->GetLastFramePluginView(pluginPos, pluginAng);
 
-	const ObserverMode defaultMode = (ObserverMode)Interfaces::GetHLTVCamera()->m_nCameraMode;
+	const ObserverMode defaultMode = (ObserverMode)Interfaces::GetHLTVCamera()->GetMode();
 
 	// Legacy support, we used to always force OBS_MODE_FIXED
 	if (ParseSpecPosCommand(command, pos, ang, mode, pluginPos, pluginAng, defaultMode))
@@ -888,7 +904,7 @@ void CameraTools::SpecPositionDelta(const CCommand& command)
 	QAngle ang;
 	ObserverMode mode;
 
-	const ObserverMode defaultMode = (ObserverMode)Interfaces::GetHLTVCamera()->m_nCameraMode;
+	const ObserverMode defaultMode = (ObserverMode)Interfaces::GetHLTVCamera()->GetMode();
 
 	if (ParseSpecPosCommand(command, pos, ang, mode, vec3_origin, vec3_angle, defaultMode))
 	{

CastingEssentials/Modules/CameraTools.h

@@ -16,6 +16,12 @@ class C_HLTVCamera;
 class C_BaseEntity;
 class Player;
 
+enum class ModeSwitchReason
+{
+	Unknown,
+	SpecPosition,
+};
+
 class CameraTools final : public Module<CameraTools>, public ICameraOverride
 {
 public:
@@ -24,16 +30,17 @@ class CameraTools final : public Module<CameraTools>, public ICameraOverride
 
 	static bool CheckDependencies();
 
-	void SpecPosition(const Vector& pos, const QAngle& angle, ObserverMode mode = OBS_MODE_FIXED);
+	void SpecPosition(const Vector& pos, const QAngle& angle, ObserverMode mode = OBS_MODE_FIXED, float fov = -1);
 
 	static float CollisionTest3D(const Vector& startPos, const Vector& targetPos, float scale,
 	                             const IHandleEntity* ignoreEnt = nullptr);
 
-
+	ModeSwitchReason GetModeSwitchReason() const { return m_SwitchReason; }
 
 private:
 	int m_SetModeHook;
 	int m_SetPrimaryTargetHook;
+	int m_GetDefaultFOVHook;
 	KeyValues* m_SpecGUISettings;
 
 	void SetModeOverride(int iMode);
@@ -94,7 +101,12 @@ class CameraTools final : public Module<CameraTools>, public ICameraOverride
 	bool InToolModeOverride() const override { return m_ViewOverride; }
 	bool IsThirdPersonCameraOverride() const override { return m_ViewOverride; }
 	bool SetupEngineViewOverride(Vector& origin, QAngle& angles, float& fov) override;
+	int GetDefaultFOVOverride() const;
 	bool m_ViewOverride;
 	QAngle m_LastFrameAngle;
 	Player* m_LastTargetPlayer;
+
+	void AttachHooks(bool attach);
+
+	ModeSwitchReason m_SwitchReason;
 };