Disable instant back to gameplay camera after disabling free cam

Author: TheIndra55

Camera.cpp

@@ -93,7 +93,7 @@ void __cdecl GAMELOOP_Process(int a1)
 {
 	origGAMELOOP_Process(a1);
 
-	if (Hooking::GetInstance().GetMenu()->IsFreecam())
+	if (Hooking::GetInstance().GetMenu()->GetFreeCamMode() == FreeCameraMode::enabled)
 	{
 		auto speed = IsActionPressed(34);
 		auto camera = *reinterpret_cast<int*>(0xE80534);

Hooking.cpp

@@ -45,7 +45,7 @@ Hooking::Hooking()
 	InsertTerrainDrawableHooks();
 
 #if TRAE // TODO
-	InstallSoundHooks();
+	//InstallSoundHooks();
 
 	MH_CreateHook((void*)0x467E60, MakePeHandle, nullptr);
 #elif TR7

Menu.cpp

@@ -391,16 +391,27 @@ void Menu::Process(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
         auto cameraMode = (int*)0x850984;
         *cameraMode = *cameraMode == 7 ? 2 : 7;
 #elif TR8
-        m_freecam = !m_freecam;
-        if (m_freecam)
+        if (m_freeCamMode == FreeCameraMode::disabled)
         {
+            // enable free camera
+            m_freeCamMode = FreeCameraMode::enabled;
+
+            // switch to camera
             CAMERA_SetMode(11);
 
             auto camera = *(int*)0xE80534;
             *(cdc::Vector*)(camera + 0x40) = (*(Instance**)PLAYERINSTANCE)->position;
         }
-        else
+        else if (m_freeCamMode == FreeCameraMode::enabled)
         {
+            // disable free camera but keep camera active
+            m_freeCamMode = FreeCameraMode::nocontrol;
+        }
+        else if (m_freeCamMode == FreeCameraMode::nocontrol)
+        {
+            m_freeCamMode = FreeCameraMode::disabled;
+
+            // switch back to gameplay camera
             _setToGameplayCamera(0xE804F0 /* AVCameraManager */);
         }
 #endif
@@ -1078,9 +1089,9 @@ bool Menu::IsFocus() const noexcept
     return m_focus;
 }
 
-bool Menu::IsFreecam() const noexcept
+FreeCameraMode Menu::GetFreeCamMode() const noexcept
 {
-    return m_freecam;
+    return m_freeCamMode;
 }
 
 void Menu::SetFocus(bool value) noexcept

Menu.hpp

@@ -8,6 +8,13 @@
 
 #include "Game.hpp"
 
+enum class FreeCameraMode
+{
+	enabled,
+	nocontrol,
+	disabled,
+};
+
 struct DrawSettings
 {
 	bool draw = false;
@@ -42,7 +49,7 @@ class Menu
 	void SetDevice(LPDIRECT3DDEVICE9 pd3dDevice);
 	void Log(const char* fmt, ...);
 
-	bool IsFreecam() const noexcept;
+	FreeCameraMode GetFreeCamMode() const noexcept;
 	bool IsFocus() const noexcept;
 	bool IsVisible() const noexcept;
 	void SetFocus(bool value) noexcept;
@@ -70,7 +77,7 @@ class Menu
 	bool m_visible = true;
 	bool m_isAzertyLayout = false;
 
-	bool m_freecam = false;
+	FreeCameraMode m_freeCamMode = FreeCameraMode::disabled;
 
 	ImGuiTextBuffer logBuffer;