ChaosMod/Failsafe: Remove redundant global idx setter / getter

gta-chaos-mod · Feb 26, 2024 · e89b547 · e89b547
1 parent f40f5dc
commit e89b547
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/ChaosMod/Components/Failsafe.cpp b/ChaosMod/Components/Failsafe.cpp
@@ -27,7 +27,7 @@ Failsafe::Failsafe() : Component()
 	    Hooks::OnScriptThreadRun,
 	    [](rage::scrThread *thread)
 	    {
-		    if (!ms_SearchedForMissionStateGlobal && !Failsafe::GetGlobalIndex() && !strcmp(thread->GetName(), "main"))
+		    if (!ms_SearchedForMissionStateGlobal && !ms_StateGlobalIdx && !strcmp(thread->GetName(), "main"))
 		    {
 			    auto program = Memory::ScriptThreadToProgram(thread);
 			    if (program->m_CodeBlocks)
@@ -50,9 +50,9 @@ Failsafe::Failsafe() : Component()
 				    }
 				    else
 				    {
-					    Failsafe::SetGlobalIndex(handle.At(8).Value<int>() & 0xFFFFFF);
+					    ms_StateGlobalIdx = handle.At(8).Value<int>() & 0xFFFFFF;
 
-					    LOG("Fail state global found (Global: " << Failsafe::GetGlobalIndex() << ")");
+					    LOG("Fail state global found (Global: " << ms_StateGlobalIdx << ")");
 				    }
 			    }
 		    }
@@ -61,16 +61,6 @@ Failsafe::Failsafe() : Component()
 	    });
 }
 
-void Failsafe::SetGlobalIndex(int idx)
-{
-	ms_StateGlobalIdx = idx;
-}
-
-int Failsafe::GetGlobalIndex()
-{
-	return ms_StateGlobalIdx;
-}
-
 void Failsafe::OnRun()
 {
 	if (!m_Enabled || !ms_StateGlobalIdx || !ComponentExists<EffectDispatcher>())

diff --git a/ChaosMod/Components/Failsafe.h b/ChaosMod/Components/Failsafe.h
@@ -19,9 +19,6 @@ class Failsafe : public Component
 	Failsafe();
 
   public:
-	static void SetGlobalIndex(int idx);
-	static int GetGlobalIndex();
-
 	virtual void OnRun() override;
 
 	template <class T>