Merge pull request #39 from MindRapist/mr-2

MR-2: Macro leftovers removed

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;

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();

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
 

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();

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;

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;