Don't touch my private members

TheIndra55 · Aug 17, 2024 · 32aa34b · 32aa34b
1 parent 92e690c
commit 32aa34b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/src/cdc/render/PCDeviceManager.cpp b/src/cdc/render/PCDeviceManager.cpp
@@ -24,6 +24,11 @@ HWND cdc::PCDeviceManager::GetWindow()
 	return m_hFocusWindow;
 }
 
+cdc::PCDeviceManager* cdc::PCDeviceManager::GetInstance()
+{
+	return s_pInstance;
+}
+
 void cdc::PCDeviceManager::AddDeviceResource(PCInternalResource* resource)
 {
 #ifndef TR8

diff --git a/src/cdc/render/PCDeviceManager.h b/src/cdc/render/PCDeviceManager.h
@@ -5,6 +5,8 @@
 
 #include "PCInternalResource.h"
 
+class Hook;
+
 namespace cdc
 {
 	class PCDeviceManager
@@ -28,6 +30,8 @@ namespace cdc
 
 		bool m_bIsRecreatingResources;
 
+		static PCDeviceManager* s_pInstance;
+
 	public:
 		bool IsStatusOk();
 		bool IsCreatingResources();
@@ -37,6 +41,8 @@ namespace cdc
 
 		void AddDeviceResource(PCInternalResource* resource);
 
-		static PCDeviceManager* s_pInstance;
+		static PCDeviceManager* GetInstance();
+
+		friend class Hook;
 	};
 }
diff --git a/src/cdc/render/PCInternalResource.cpp b/src/cdc/render/PCInternalResource.cpp
@@ -3,7 +3,7 @@
 
 cdc::PCInternalResource::PCInternalResource() : m_pPrev(nullptr), m_pNext(nullptr)
 {
-	PCDeviceManager::s_pInstance->AddDeviceResource(this);
+	PCDeviceManager::GetInstance()->AddDeviceResource(this);
 }
 
 cdc::PCInternalResource::~PCInternalResource()
@@ -27,7 +27,7 @@ void cdc::PCInternalResource::OnSettingsChanged()
 
 void cdc::PCInternalResource::OnConstruct()
 {
-	auto deviceManager = cdc::PCDeviceManager::s_pInstance;
+	auto deviceManager = PCDeviceManager::GetInstance();
 
 	if (deviceManager->IsStatusOk() && !deviceManager->IsCreatingResources())
 	{

diff --git a/src/input/MessageHook.cpp b/src/input/MessageHook.cpp
@@ -15,7 +15,7 @@ static LRESULT WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 void MessageHook::OnMessage(std::function<void(HWND, UINT, WPARAM, LPARAM)> callback) noexcept
 {
 	// Get the window handle
-	auto hWnd = cdc::PCDeviceManager::s_pInstance->GetWindow();
+	auto hWnd = cdc::PCDeviceManager::GetInstance()->GetWindow();
 
 	// Set the new message handler to our handler
 	s_original = (WNDPROC)SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)WndProc);

diff --git a/src/menu/Menu.cpp b/src/menu/Menu.cpp
@@ -20,7 +20,7 @@ Menu::Menu() : PCInternalResource()
 	ImGui::CreateContext();
 
 	// We can do this since we always create the menu after D3D_Init
-	ImGui_ImplWin32_Init(cdc::PCDeviceManager::s_pInstance->GetWindow());
+	ImGui_ImplWin32_Init(cdc::PCDeviceManager::GetInstance()->GetWindow());
 
 	// Add present callback to draw the UI
 	RenderContext::OnPresent(std::bind(&Menu::OnPresent, this));
@@ -32,7 +32,7 @@ Menu::Menu() : PCInternalResource()
 bool Menu::OnCreateDevice()
 {
 	// Initialize the DirectX9 backend for ImGui
-	ImGui_ImplDX9_Init(cdc::PCDeviceManager::s_pInstance->GetD3DDevice());
+	ImGui_ImplDX9_Init(cdc::PCDeviceManager::GetInstance()->GetD3DDevice());
 
 	m_initialized = true;
 

diff --git a/src/render/Draw.cpp b/src/render/Draw.cpp
@@ -52,7 +52,7 @@ void DRAW_DrawLines(LINEVERTEX* verts, int numlines)
 #else
 	// The DRAW_DrawLines method has been optimized away in Anniversary
 	// the code below is a reimplementation of the code from Legend
-	if (cdc::PCDeviceManager::s_pInstance->IsStatusOk())
+	if (cdc::PCDeviceManager::GetInstance()->IsStatusOk())
 	{
 		auto linePool = *(cdc::PCPrimitivePool**)0x7545E0;
 		auto vertices = (LINEVERTEX*)linePool->AllocateVertices(numlines * 2);