From b344e5505e8e2aaf749ea8ba75b5f42a0b791263 Mon Sep 17 00:00:00 2001
From: Mind Rapist <mindfreak5914@gmail.com>
Date: Sat, 20 Dec 2025 15:55:39 +0200
Subject: [PATCH] MR-2: Macro leftovers removed

---
 src/EffectLib/EffectInstance.cpp  | 2 --
 src/EffectLib/EffectInstance.h    | 2 --
 src/EffectLib/EffectManager.cpp   | 4 ----
 src/EffectLib/EffectManager.h     | 4 ----
 src/EterLib/GrpObjectInstance.cpp | 8 --------
 src/EterLib/GrpObjectInstance.h   | 4 ----
 6 files changed, 24 deletions(-)

diff --git a/src/EffectLib/EffectInstance.cpp b/src/EffectLib/EffectInstance.cpp
index 0c9d4bf..9d0e522 100644
--- a/src/EffectLib/EffectInstance.cpp
+++ b/src/EffectLib/EffectInstance.cpp
@@ -269,9 +269,7 @@ void CEffectInstance::Clear()
 
 void CEffectInstance::__Initialize()
 {
-#ifdef __ENABLE_STEALTH_FIX__
 	ReleaseAlwaysHidden();
-#endif
 	m_isAlive = FALSE;
 	m_dwFrame = 0;
 	m_pSoundInstanceVector = NULL;
diff --git a/src/EffectLib/EffectInstance.h b/src/EffectLib/EffectInstance.h
index 7a1fcb2..33ce42b 100644
--- a/src/EffectLib/EffectInstance.h
+++ b/src/EffectLib/EffectInstance.h
@@ -43,13 +43,11 @@ class CEffectInstance : public CGraphicObjectInstance
 
 		void SetEffectDataPointer(CEffectData * pEffectData);
 		
-#ifdef __ENABLE_STEALTH_FIX__ //EXP
 		// Returns the pointer to the effect data associated with this instance.
 		CEffectData* GetEffectDataPointer() const
 		{
 			return m_pkEftData;
 		}
-#endif
 
 		void Clear();
 		BOOL isAlive();
diff --git a/src/EffectLib/EffectManager.cpp b/src/EffectLib/EffectManager.cpp
index 3c5e936..b32329d 100644
--- a/src/EffectLib/EffectManager.cpp
+++ b/src/EffectLib/EffectManager.cpp
@@ -351,7 +351,6 @@ void CEffectManager::HideEffect()
 	m_pSelectedEffectInstance->Hide();
 }
 
-#ifdef __ENABLE_STEALTH_FIX__
 void CEffectManager::ApplyAlwaysHidden()
 {
 	if (!m_pSelectedEffectInstance)
@@ -367,7 +366,6 @@ void CEffectManager::ReleaseAlwaysHidden()
 
 	m_pSelectedEffectInstance->ReleaseAlwaysHidden();
 }
-#endif
 
 bool CEffectManager::GetEffectData(DWORD dwID, CEffectData ** ppEffect)
 {
@@ -480,7 +478,6 @@ CEffectManager::~CEffectManager()
 	Destroy();
 }
 
-#ifdef __ENABLE_STEALTH_FIX__ //EXP
 DWORD CEffectManager::GetSelectedEffectDataCRC() const
 {
 	if (!m_pSelectedEffectInstance)
@@ -498,7 +495,6 @@ DWORD CEffectManager::GetSelectedEffectDataCRC() const
 	StringPath(cszFile, str);
 	return GetCaseCRC32(str.c_str(), (int)str.length());
 }
-#endif
 
 // just for map effect
 
diff --git a/src/EffectLib/EffectManager.h b/src/EffectLib/EffectManager.h
index b04fb09..fb7e245 100644
--- a/src/EffectLib/EffectManager.h
+++ b/src/EffectLib/EffectManager.h
@@ -57,10 +57,8 @@ class CEffectManager : public CScreen, public CSingleton<CEffectManager>
 		void ShowEffect();
 		void HideEffect();
 
-#ifdef __ENABLE_STEALTH_FIX__
 		void ApplyAlwaysHidden();
 		void ReleaseAlwaysHidden();
-#endif
 
 		// Temporary function
 		DWORD GetRandomEffect();
@@ -75,10 +73,8 @@ class CEffectManager : public CScreen, public CSingleton<CEffectManager>
 
 		int GetRenderingEffectCount();
 
-#ifdef __ENABLE_STEALTH_FIX__ //EXP
 		// Return the CRC of the effect-data for the selected effect instance.
 		DWORD GetSelectedEffectDataCRC() const;
-#endif
 
 	protected:
 		void __Initialize();
diff --git a/src/EterLib/GrpObjectInstance.cpp b/src/EterLib/GrpObjectInstance.cpp
index 12ce158..0cec621 100644
--- a/src/EterLib/GrpObjectInstance.cpp
+++ b/src/EterLib/GrpObjectInstance.cpp
@@ -201,7 +201,6 @@ void CGraphicObjectInstance::Hide()
 	m_isVisible = false;
 }
 
-#ifdef __ENABLE_STEALTH_FIX__
 void CGraphicObjectInstance::ApplyAlwaysHidden() {
 	m_isAlwaysHidden = true;
 }
@@ -209,15 +208,10 @@ void CGraphicObjectInstance::ApplyAlwaysHidden() {
 void CGraphicObjectInstance::ReleaseAlwaysHidden() {
 	m_isAlwaysHidden = false;
 }
-#endif
 
 bool CGraphicObjectInstance::isShow()
 {
-#ifdef __ENABLE_STEALTH_FIX__
 	return m_isVisible && !m_isAlwaysHidden;
-#else
-	return m_isVisible;
-#endif
 }
 
 // 
@@ -292,9 +286,7 @@ void CGraphicObjectInstance::Initialize()
 
 	m_BlockCamera = false;
 
-#ifdef __ENABLE_STEALTH_FIX__
 	m_isAlwaysHidden = false;
-#endif
 
 	
 	m_v3Position.x = m_v3Position.y = m_v3Position.z = 0.0f;
diff --git a/src/EterLib/GrpObjectInstance.h b/src/EterLib/GrpObjectInstance.h
index 7714536..297c0de 100644
--- a/src/EterLib/GrpObjectInstance.h
+++ b/src/EterLib/GrpObjectInstance.h
@@ -57,10 +57,8 @@ class CGraphicObjectInstance : public CGraphicCollisionObject
 		void					Hide();
 		bool					isShow();
 
-#ifdef __ENABLE_STEALTH_FIX__
 		void					ApplyAlwaysHidden();
 		void					ReleaseAlwaysHidden();
-#endif
 
 
 		// Camera Block
@@ -115,9 +113,7 @@ class CGraphicObjectInstance : public CGraphicCollisionObject
 		D3DXMATRIX				m_mRotation;
 
 		bool					m_isVisible;
-#ifdef __ENABLE_STEALTH_FIX__
 		bool					m_isAlwaysHidden;
-#endif
 
 		D3DXMATRIX				m_worldMatrix;